Merge branch 'develop' into 1985-extend-benchmark-data-collector

CMakeLists.txt

@@ -236,6 +236,10 @@ if(ENABLE_COVERAGE_TESTING)
     SET(CMAKE_CXX_FLAGS "--coverage ${CMAKE_CXX_FLAGS}")
 endif()
 
+# fc/src/compress/miniz.c breaks strict aliasing. The Linux kernel builds with no strict aliasing
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing -Werror" )
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-strict-aliasing -Werror" )
+
 # external_plugins needs to be compiled first because libraries/app depends on STEEM_EXTERNAL_PLUGINS being fully populated
 add_subdirectory( external_plugins )
 add_subdirectory( libraries )

Dockerfile

@@ -219,6 +219,9 @@ ADD doc/seednodes.txt /etc/steemd/seednodes.txt
 # the following adds lots of logging info to stdout
 ADD contrib/config-for-docker.ini /etc/steemd/config.ini
 ADD contrib/fullnode.config.ini /etc/steemd/fullnode.config.ini
+ADD contrib/fullnode.opswhitelist.config.ini /etc/steemd/fullnode.opswhitelist.config.ini
+ADD contrib/config-for-broadcaster.ini /etc/steemd/config-for-broadcaster.ini
+ADD contrib/config-for-ahnode.ini /etc/steemd/config-for-ahnode.ini
 
 # add normal startup script that starts via sv
 ADD contrib/steemd.run /usr/local/bin/steem-sv-run.sh

contrib/config-for-ahnode.ini

@@ -0,0 +1,86 @@
+# Console appender definition json: {"appender", "stream"}
+log-console-appender = {"appender":"stderr","stream":"std_error"}
+
+# File appender definition json:  {"appender", "file"}
+log-file-appender = {"appender":"p2p","file":"logs/p2p/p2p.log"}
+
+# Logger definition json: {"name", "level", "appender"}
+log-logger = {"name":"default","level":"debug","appender":"stderr"}
+log-logger = {"name":"p2p","level":"info","appender":"stderr"}
+
+# Plugin(s) to enable, may be specified multiple times
+plugin = webserver p2p json_rpc account_history
+
+plugin = database_api account_history_api condenser_api
+
+# Defines a range of accounts to track as a json pair ["from","to"] [from,to] Can be specified multiple times
+# account-history-track-account-range =
+
+# Defines a list of operations which will be explicitly logged.
+# account-history-whitelist-ops = transfer_operation transfer_to_vesting_operation withdraw_vesting_operation interest_operation transfer_to_savings_operation transfer_from_savings_operation cancel_transfer_from_savings_operation escrow_transfer_operation escrow_approve_operation escrow_dispute_operation escrow_release_operation fill_convert_request_operation fill_order_operation claim_reward_balance_operation author_reward_operation curation_reward_operation fill_vesting_withdraw_operation fill_transfer_from_savings_operation delegate_vesting_shares_operation return_vesting_delegation_operation comment_benefactor_reward_operation
+
+# Defines a list of operations which will be explicitly ignored.
+# account-history-blacklist-ops =
+
+# the location of the chain shared memory files (absolute path or relative to application data dir)
+# shared-file-dir = "blockchain"
+
+# Size of the shared memory file. Default: 54G
+shared-file-size = 215G
+
+# Pairs of [BLOCK_NUM,BLOCK_ID] that should be enforced as checkpoints.
+# checkpoint =
+
+# flush shared memory changes to disk every N blocks
+# flush-state-interval = 0
+
+# Database edits to apply on startup (may specify multiple times)
+# edit-script =
+
+# Set the maximum size of cached feed for an account
+follow-max-feed-size = 500
+
+# Block time (in epoch seconds) when to start calculating feeds
+# follow-start-feeds = 0
+
+# Track market history by grouping orders into buckets of equal size measured in seconds specified as a JSON array of numbers
+market-history-bucket-size = [15,60,300,3600,86400]
+
+# How far back in time to track history for each bucket size, measured in the number of buckets (default: 5760)
+market-history-buckets-per-size = 5760
+
+# The local IP address and port to listen for incoming connections.
+# p2p-endpoint =
+
+# Maxmimum number of incoming connections on P2P endpoint
+# p2p-max-connections =
+
+# The IP address and port of a remote peer to sync with. Deprecated in favor of p2p-seed-node.
+# seed-node =
+
+# The IP address and port of a remote peer to sync with.
+# p2p-seed-node =
+
+# User agent to advertise to peers
+p2p-user-agent = Graphene Reference Implementation
+
+# The local IP and port to listen for incoming http connections.
+# webserver-http-endpoint =
+
+# The local IP and port to listen for incoming websocket connections.
+# webserver-ws-endpoint =
+
+# Number of threads used to handle queries. Default: 256.
+webserver-thread-pool-size = 1024
+
+# Enable block production, even if the chain is stale.
+enable-stale-production = false
+
+# Percent of witnesses (0-99) that must be participating in order to produce blocks
+# required-participation =
+
+# name of witness controlled by this node (e.g. initwitness )
+# witness =
+
+# WIF PRIVATE KEY to be used by one or more witnesses or miners
+# private-key =

contrib/config-for-broadcaster.ini

@@ -0,0 +1,86 @@
+# Console appender definition json: {"appender", "stream"}
+log-console-appender = {"appender":"stderr","stream":"std_error"}
+
+# File appender definition json:  {"appender", "file"}
+log-file-appender = {"appender":"p2p","file":"logs/p2p/p2p.log"}
+
+# Logger definition json: {"name", "level", "appender"}
+log-logger = {"name":"default","level":"info","appender":"stderr"}
+log-logger = {"name":"p2p","level":"info","appender":"stderr"}
+
+# Plugin(s) to enable, may be specified multiple times
+plugin = webserver p2p json_rpc witness
+
+plugin = database_api witness_api condenser_api network_broadcast_api
+
+# Defines a range of accounts to track as a json pair ["from","to"] [from,to] Can be specified multiple times
+# account-history-track-account-range =
+
+# Defines a list of operations which will be explicitly logged.
+# account-history-whitelist-ops =
+
+# Defines a list of operations which will be explicitly ignored.
+# account-history-blacklist-ops =
+
+# the location of the chain shared memory files (absolute path or relative to application data dir)
+# shared-file-dir = "blockchain"
+
+# Size of the shared memory file. Default: 54G
+shared-file-size = 24G
+
+# Pairs of [BLOCK_NUM,BLOCK_ID] that should be enforced as checkpoints.
+# checkpoint =
+
+# flush shared memory changes to disk every N blocks
+flush-state-interval = 0
+
+# Database edits to apply on startup (may specify multiple times)
+# edit-script =
+
+# Set the maximum size of cached feed for an account
+follow-max-feed-size = 500
+
+# Block time (in epoch seconds) when to start calculating feeds
+# follow-start-feeds = 0
+
+# Track market history by grouping orders into buckets of equal size measured in seconds specified as a JSON array of numbers
+market-history-bucket-size = [15,60,300,3600,86400]
+
+# How far back in time to track history for each bucket size, measured in the number of buckets (default: 5760)
+market-history-buckets-per-size = 5760
+
+# The local IP address and port to listen for incoming connections.
+# p2p-endpoint =
+
+# Maxmimum number of incoming connections on P2P endpoint
+# p2p-max-connections =
+
+# The IP address and port of a remote peer to sync with. Deprecated in favor of p2p-seed-node.
+# seed-node =
+
+# The IP address and port of a remote peer to sync with.
+# p2p-seed-node =
+
+# User agent to advertise to peers
+p2p-user-agent = Graphene Reference Implementation
+
+# The local IP and port to listen for incoming http connections.
+# webserver-http-endpoint =
+
+# The local IP and port to listen for incoming websocket connections.
+# webserver-ws-endpoint =
+
+# Number of threads used to handle queries. Default: 256.
+webserver-thread-pool-size = 1024
+
+# Enable block production, even if the chain is stale.
+enable-stale-production = false
+
+# Percent of witnesses (0-99) that must be participating in order to produce blocks
+# required-participation =
+
+# name of witness controlled by this node (e.g. initwitness )
+# witness =
+
+# WIF PRIVATE KEY to be used by one or more witnesses or miners
+# private-key =

contrib/fullnode.config.ini

@@ -9,9 +9,9 @@ log-logger = {"name":"default","level":"debug","appender":"stderr"}
 log-logger = {"name":"p2p","level":"info","appender":"stderr"}
 
 # Plugin(s) to enable, may be specified multiple times
-plugin = webserver p2p json_rpc witness account_history account_by_key tags follow market_history
+plugin = webserver p2p json_rpc witness account_by_key tags follow market_history
 
-plugin = database_api account_by_key_api network_broadcast_api tags_api follow_api market_history_api account_history_api witness_api condenser_api
+plugin = database_api account_by_key_api network_broadcast_api tags_api follow_api market_history_api witness_api condenser_api
 
 # Defines a range of accounts to track as a json pair ["from","to"] [from,to] Can be specified multiple times
 # account-history-track-account-range =
@@ -26,7 +26,7 @@ plugin = database_api account_by_key_api network_broadcast_api tags_api follow_a
 # shared-file-dir = "blockchain"
 
 # Size of the shared memory file. Default: 54G
-shared-file-size = 160G
+shared-file-size = 215G
 
 # Pairs of [BLOCK_NUM,BLOCK_ID] that should be enforced as checkpoints.
 # checkpoint =

contrib/fullnode.opswhitelist.config.ini

@@ -0,0 +1,86 @@
+# Console appender definition json: {"appender", "stream"}
+log-console-appender = {"appender":"stderr","stream":"std_error"}
+
+# File appender definition json:  {"appender", "file"}
+log-file-appender = {"appender":"p2p","file":"logs/p2p/p2p.log"}
+
+# Logger definition json: {"name", "level", "appender"}
+log-logger = {"name":"default","level":"debug","appender":"stderr"}
+log-logger = {"name":"p2p","level":"info","appender":"stderr"}
+
+# Plugin(s) to enable, may be specified multiple times
+plugin = webserver p2p json_rpc witness account_by_key tags follow market_history account_history
+
+plugin = database_api account_by_key_api network_broadcast_api tags_api follow_api market_history_api witness_api condenser_api account_history_api
+
+# Defines a range of accounts to track as a json pair ["from","to"] [from,to] Can be specified multiple times
+# account-history-track-account-range =
+
+# Defines a list of operations which will be explicitly logged.
+account-history-whitelist-ops = transfer_operation transfer_to_vesting_operation withdraw_vesting_operation interest_operation transfer_to_savings_operation transfer_from_savings_operation cancel_transfer_from_savings_operation escrow_transfer_operation escrow_approve_operation escrow_dispute_operation escrow_release_operation fill_convert_request_operation fill_order_operation claim_reward_balance_operation author_reward_operation curation_reward_operation fill_vesting_withdraw_operation fill_transfer_from_savings_operation delegate_vesting_shares_operation return_vesting_delegation_operation comment_benefactor_reward_operation
+
+# Defines a list of operations which will be explicitly ignored.
+# account-history-blacklist-ops =
+
+# the location of the chain shared memory files (absolute path or relative to application data dir)
+# shared-file-dir = "blockchain"
+
+# Size of the shared memory file. Default: 54G
+shared-file-size = 215G
+
+# Pairs of [BLOCK_NUM,BLOCK_ID] that should be enforced as checkpoints.
+# checkpoint =
+
+# flush shared memory changes to disk every N blocks
+# flush-state-interval = 0
+
+# Database edits to apply on startup (may specify multiple times)
+# edit-script =
+
+# Set the maximum size of cached feed for an account
+follow-max-feed-size = 500
+
+# Block time (in epoch seconds) when to start calculating feeds
+# follow-start-feeds = 0
+
+# Track market history by grouping orders into buckets of equal size measured in seconds specified as a JSON array of numbers
+market-history-bucket-size = [15,60,300,3600,86400]
+
+# How far back in time to track history for each bucket size, measured in the number of buckets (default: 5760)
+market-history-buckets-per-size = 5760
+
+# The local IP address and port to listen for incoming connections.
+# p2p-endpoint =
+
+# Maxmimum number of incoming connections on P2P endpoint
+# p2p-max-connections =
+
+# The IP address and port of a remote peer to sync with. Deprecated in favor of p2p-seed-node.
+# seed-node =
+
+# The IP address and port of a remote peer to sync with.
+# p2p-seed-node =
+
+# User agent to advertise to peers
+p2p-user-agent = Graphene Reference Implementation
+
+# The local IP and port to listen for incoming http connections.
+# webserver-http-endpoint =
+
+# The local IP and port to listen for incoming websocket connections.
+# webserver-ws-endpoint =
+
+# Number of threads used to handle queries. Default: 256.
+webserver-thread-pool-size = 1024
+
+# Enable block production, even if the chain is stale.
+enable-stale-production = false
+
+# Percent of witnesses (0-99) that must be participating in order to produce blocks
+# required-participation =
+
+# name of witness controlled by this node (e.g. initwitness )
+# witness =
+
+# WIF PRIVATE KEY to be used by one or more witnesses or miners
+# private-key =

contrib/paas-sv-run.sh

@@ -1,15 +1,5 @@
 #!/bin/bash
 
-# if all of the reader nodes die, kill runsv causing the container to exit
-if [[ "$USE_MULTICORE_READONLY" ]]; then
-  STEEMD_READONLY_PIDS=`pgrep -f read-only`
-  if [[ ! $? -eq 0 ]]; then
-  	echo NOTIFYALERT! steemd reader nodes have quit unexpectedly, starting a new instance..
-    RUN_SV_PID=`pgrep -f /etc/service/steemd`
-    kill -9 $RUN_SV_PID
-  fi
-fi
-
 # if the writer node dies, kill runsv causing the container to exit
 STEEMD_PID=`pgrep -f p2p-endpoint`
 if [[ ! $? -eq 0 ]]; then