diff --git a/builds/cmake/install-cmake.sh b/builds/cmake/install-cmake.sh index 749b0b0c..a687c289 100755 --- a/builds/cmake/install-cmake.sh +++ b/builds/cmake/install-cmake.sh @@ -70,10 +70,10 @@ if [[ -z ${secp256k1_TAG} ]]; then fi if [[ -z ${libbitcoin_system_OWNER} ]]; then - libbitcoin_system_OWNER="libbitcoin" + libbitcoin_system_OWNER="thecodefactory" fi if [[ -z ${libbitcoin_system_TAG} ]]; then - libbitcoin_system_TAG="master" + libbitcoin_system_TAG="testnet4" fi if [[ -z ${libbitcoin_database_OWNER} ]]; then @@ -91,10 +91,10 @@ if [[ -z ${libbitcoin_network_TAG} ]]; then fi if [[ -z ${libbitcoin_node_OWNER} ]]; then - libbitcoin_node_OWNER="libbitcoin" + libbitcoin_node_OWNER="thecodefactory" fi if [[ -z ${libbitcoin_node_TAG} ]]; then - libbitcoin_node_TAG="master" + libbitcoin_node_TAG="testnet4" fi if [[ -z ${libbitcoin_server_OWNER} ]]; then diff --git a/builds/gnu/install-gnu.sh b/builds/gnu/install-gnu.sh index 0bb4e5e0..57534e5e 100755 --- a/builds/gnu/install-gnu.sh +++ b/builds/gnu/install-gnu.sh @@ -70,10 +70,10 @@ if [[ -z ${secp256k1_TAG} ]]; then fi if [[ -z ${libbitcoin_system_OWNER} ]]; then - libbitcoin_system_OWNER="libbitcoin" + libbitcoin_system_OWNER="thecodefactory" fi if [[ -z ${libbitcoin_system_TAG} ]]; then - libbitcoin_system_TAG="master" + libbitcoin_system_TAG="testnet4" fi if [[ -z ${libbitcoin_database_OWNER} ]]; then @@ -91,10 +91,10 @@ if [[ -z ${libbitcoin_network_TAG} ]]; then fi if [[ -z ${libbitcoin_node_OWNER} ]]; then - libbitcoin_node_OWNER="libbitcoin" + libbitcoin_node_OWNER="thecodefactory" fi if [[ -z ${libbitcoin_node_TAG} ]]; then - libbitcoin_node_TAG="master" + libbitcoin_node_TAG="testnet4" fi if [[ -z ${libbitcoin_server_OWNER} ]]; then diff --git a/builds/msvc/build-msvc.cmd b/builds/msvc/build-msvc.cmd index dd7fca07..6991a682 100644 --- a/builds/msvc/build-msvc.cmd +++ b/builds/msvc/build-msvc.cmd @@ -39,10 +39,10 @@ if "!NUGET_EXE!" == "" ( ) if "!libbitcoin_system_OWNER!" == "" ( - set "libbitcoin_system_OWNER=libbitcoin" + set "libbitcoin_system_OWNER=thecodefactory" ) if "!libbitcoin_system_TAG!" == "" ( - set "libbitcoin_system_TAG=master" + set "libbitcoin_system_TAG=testnet4" ) if "!libbitcoin_database_OWNER!" == "" ( @@ -60,10 +60,10 @@ if "!libbitcoin_network_TAG!" == "" ( ) if "!libbitcoin_node_OWNER!" == "" ( - set "libbitcoin_node_OWNER=libbitcoin" + set "libbitcoin_node_OWNER=thecodefactory" ) if "!libbitcoin_node_TAG!" == "" ( - set "libbitcoin_node_TAG=master" + set "libbitcoin_node_TAG=testnet4" ) if "!libbitcoin_server_OWNER!" == "" ( diff --git a/src/parser.cpp b/src/parser.cpp index 3ab76e48..a1b95e32 100644 --- a/src/parser.cpp +++ b/src/parser.cpp @@ -360,6 +360,11 @@ options_metadata parser::load_settings() THROWS value(&configured.bitcoin.forks.bip90), "Assume bip34, bip65, and bip66 activation if enabled, defaults to 'true' (hard fork)." ) + ( + "forks.bip94", + value(&configured.bitcoin.forks.bip94), + "Assume bip94 activation if enabled, defaults to 'true' (hard fork)." + ) ( "forks.bip68", value(&configured.bitcoin.forks.bip68), diff --git a/src/protocols/native/protocol_native_block.cpp b/src/protocols/native/protocol_native_block.cpp index eabb85bd..36cbca60 100644 --- a/src/protocols/native/protocol_native_block.cpp +++ b/src/protocols/native/protocol_native_block.cpp @@ -262,6 +262,7 @@ bool protocol_native::handle_get_block_header_context(const code& ec, { "bip66", context.is_enabled(chain::flags::bip66_rule) }, { "bip65", context.is_enabled(chain::flags::bip65_rule) }, { "bip90", context.is_enabled(chain::flags::bip90_rule) }, + { "bip94", context.is_enabled(chain::flags::bip94_rule) }, { "bip68", context.is_enabled(chain::flags::bip68_rule) }, { "bip112", context.is_enabled(chain::flags::bip112_rule) }, { "bip113", context.is_enabled(chain::flags::bip113_rule) },