Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add PeerMgr support for BTC testnet4 #255

Merged
merged 3 commits into from
Aug 8, 2024
Merged

Add PeerMgr support for BTC testnet4 #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8211395
Add BTC testnet4 servers.json file so that peering works on BTC test4
cculianu Aug 8, 2024
463fbc8
Bumped version to 1.11.1 after adding BTC test4 support
cculianu Aug 8, 2024
322ae5c
Updated a comment to document what BTC string is for testnet4: "testn…
cculianu Aug 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion contrib/rpm/fulcrum.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: {{{ git_repo_name name="fulcrum" }}}
Version: 1.11.0
Version: 1.11.1
Release: {{{ git_repo_version }}}%{?dist}
Summary: A fast & nimble SPV server for Bitcoin Cash & Bitcoin BTC

Expand Down
4 changes: 2 additions & 2 deletions doc/unix-man-page.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
% FULCRUM(1) Version 1.11.0 | Fulcrum Manual
% FULCRUM(1) Version 1.11.1 | Fulcrum Manual
% Fulcrum is written by Calin Culianu (cculianu)
% May 23, 2024
% August 08, 2024

# NAME

Expand Down
1 change: 1 addition & 0 deletions resources.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<file>resources/bch/servers_chipnet.json</file>
<file>resources/btc/servers.json</file>
<file>resources/btc/servers_testnet.json</file>
<file>resources/btc/servers_testnet4.json</file>
<file>resources/ltc/servers.json</file>
<file>resources/ltc/servers_testnet.json</file>
</qresource>
Expand Down
8 changes: 8 additions & 0 deletions resources/btc/servers_testnet4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"blackie.c3-soft.com": {
"pruning": "-",
"s": "57010",
"t": "57009",
"version": "1.4"
}
}
2 changes: 1 addition & 1 deletion src/BTC.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ namespace BTC
{"test4", TestNet4}, // BCHN, BU
{"scale", ScaleNet}, // BCHN, BU
{"testnet3", TestNet}, // bchd
{"testnet4", TestNet4}, // possible future bchd
{"testnet4", TestNet4}, // Core, possible future bchd
{"regtest", RegTestNet}, // BCHN, BU, ABC, bchd, Core, LitecoinCore
{"signet", TestNet}, // Core only
{"chip", ChipNet}, // BCH only; BCHN
Expand Down
2 changes: 1 addition & 1 deletion src/Common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ struct InternalError : Exception { using Exception::Exception; ~InternalError()
struct BadArgs : Exception { using Exception::Exception; ~BadArgs() override; };

#define APPNAME "Fulcrum"
#define VERSION "1.11.0"
#define VERSION "1.11.1"
#ifdef QT_DEBUG
inline constexpr bool isReleaseBuild() { return false; }
#else
Expand Down
2 changes: 1 addition & 1 deletion src/PeerMgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ void PeerMgr::startup()
else if (net == BTC::Net::TestNet)
parseServersDotJson(pathPrefix + "servers_testnet.json");
else if (net == BTC::Net::TestNet4)
parseServersDotJson(pathPrefix + "servers_testnet4.json"); // BCH only -- will implicitly throw if somehow the coin is BTC (should never happen)
parseServersDotJson(pathPrefix + "servers_testnet4.json"); // BCH & BTC only -- will implicitly throw if somehow the coin is LTC (should never happen)
else if (net == BTC::Net::ScaleNet)
parseServersDotJson(pathPrefix + "servers_scalenet.json"); // BCH only -- will implicitly throw if somehow the coin is BTC (should never happen)
else if (net == BTC::Net::ChipNet)
Expand Down