diff --git a/configure.ac b/configure.ac index 6d3537927..78f8f95dc 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 4) define(_CLIENT_VERSION_MINOR, 0) define(_CLIENT_VERSION_REVISION, 0) -define(_CLIENT_VERSION_BUILD, 0) +define(_CLIENT_VERSION_BUILD, 1) define(_CLIENT_VERSION_RC, 0) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2020) diff --git a/contrib/bitrpc/bitrpc.py b/contrib/bitrpc/bitrpc.py index 7ccb85d22..96aba65b7 100644 --- a/contrib/bitrpc/bitrpc.py +++ b/contrib/bitrpc/bitrpc.py @@ -11,9 +11,9 @@ if rpcpass == "": - access = ServiceProxy("http://127.0.0.1:47777") + access = ServiceProxy("http://127.0.0.1:36780") else: - access = ServiceProxy("http://"+rpcuser+":"+rpcpass+"@127.0.0.1:47777") + access = ServiceProxy("http://"+rpcuser+":"+rpcpass+"@127.0.0.1:36780") cmd = sys.argv[1].lower() if cmd == "backupwallet": diff --git a/contrib/debian/examples/pivx.conf b/contrib/debian/examples/pivx.conf index 8de605035..e43037a59 100644 --- a/contrib/debian/examples/pivx.conf +++ b/contrib/debian/examples/pivx.conf @@ -38,11 +38,11 @@ # Use as many addnode= settings as you like to connect to specific peers #addnode=69.164.218.197 -#addnode=10.0.0.2:17777 +#addnode=10.0.0.2:36779 # Alternatively use as many connect= settings as you like to connect ONLY to specific peers #connect=69.164.218.197 -#connect=10.0.0.1:17777 +#connect=10.0.0.1:36779 # Listening mode, enabled by default except when 'connect' is being used #listen=1 @@ -79,7 +79,7 @@ #rpcallowip=2001:db8:85a3:0:0:8a2e:370:7334/96 # Listen for RPC connections on this TCP port: -#rpcport=47777 +#rpcport=36780 # You can use Peony or peonyd to send commands to Peony/peonyd # running on another host using this option: diff --git a/contrib/innosetup/setup.iss b/contrib/innosetup/setup.iss index 976411dc0..fa55ca41a 100644 --- a/contrib/innosetup/setup.iss +++ b/contrib/innosetup/setup.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Peony Core" -#define MyAppVersion "3.0.0.0" +#define MyAppVersion "4.0.0.1" #define MyAppPublisher "2021 DECENOMY Core Developers" #define MyAppURL "https://peony.net" #define MyAppExeName "peony-qt.exe" @@ -13,7 +13,7 @@ [Setup] ; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications. ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) -AppId={{67A6CA9B-71C3-4FE2-AA2E-D0DF3D53C4EB} +AppId={{6BA22CA9-5CEF-44B5-8924-D95AE9673C6F} AppName={#MyAppName} AppVersion={#MyAppVersion} VersionInfoVersion={#MyAppVersion} @@ -50,7 +50,7 @@ Name: "custom"; Description: "Custom installation"; Flags: iscustom [Components] Name: app; Description: "{#MyAppName} {#MyAppVersion}"; Types: full compact custom; Flags: fixed -Name: bootstrap; Description: "Bootstrap blockchain files"; Types: full; ExtraDiskSpaceRequired: 7368332846; +Name: bootstrap; Description: "Bootstrap blockchain files"; Types: full; ExtraDiskSpaceRequired: 104857600; [Languages] Name: "english"; MessagesFile: "compiler:Default.isl" diff --git a/contrib/linearize/linearize-hashes.py b/contrib/linearize/linearize-hashes.py index 44697b6eb..ba116afe7 100755 --- a/contrib/linearize/linearize-hashes.py +++ b/contrib/linearize/linearize-hashes.py @@ -96,7 +96,7 @@ def get_block_hashes(settings, max_blocks_per_call=10000): if 'host' not in settings: settings['host'] = '127.0.0.1' if 'port' not in settings: - settings['port'] = 47777 + settings['port'] = 36780 if 'min_height' not in settings: settings['min_height'] = 0 if 'max_height' not in settings: diff --git a/contrib/qos/README.md b/contrib/qos/README.md index 7546bcdc7..581cc15be 100644 --- a/contrib/qos/README.md +++ b/contrib/qos/README.md @@ -1,5 +1,5 @@ ### Qos ### -This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Bitcoin network. It limits outbound TCP traffic with a source or destination port of 17777, but not if the destination IP is within a LAN (defined as 192.168.x.x). +This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Bitcoin network. It limits outbound TCP traffic with a source or destination port of 36779, but not if the destination IP is within a LAN (defined as 192.168.x.x). This means one can have an always-on peonyd instance running, and another local peonyd/peony-qt instance which connects to this node and receives blocks from it. diff --git a/contrib/qos/tc.sh b/contrib/qos/tc.sh index d7e7cf400..56c5029b0 100644 --- a/contrib/qos/tc.sh +++ b/contrib/qos/tc.sh @@ -32,10 +32,10 @@ tc filter add dev ${IF} parent 1: protocol ip prio 2 handle 2 fw classid 1:11 # ret=$? #done -#limit outgoing traffic to and from port 17777. but not when dealing with a host on the local network +#limit outgoing traffic to and from port 36779. but not when dealing with a host on the local network # (defined by $LOCALNET) # --set-mark marks packages matching these criteria with the number "2" # these packages are filtered by the tc filter with "handle 2" # this filter sends the packages into the 1:11 class, and this class is limited to ${LIMIT} -iptables -t mangle -A OUTPUT -p tcp -m tcp --dport 17777 ! -d ${LOCALNET} -j MARK --set-mark 0x2 -iptables -t mangle -A OUTPUT -p tcp -m tcp --sport 17777 ! -d ${LOCALNET} -j MARK --set-mark 0x2 +iptables -t mangle -A OUTPUT -p tcp -m tcp --dport 36779 ! -d ${LOCALNET} -j MARK --set-mark 0x2 +iptables -t mangle -A OUTPUT -p tcp -m tcp --sport 36779 ! -d ${LOCALNET} -j MARK --set-mark 0x2 diff --git a/contrib/seeds/generate-seeds.py b/contrib/seeds/generate-seeds.py index f9a38dc41..4d13014a3 100644 --- a/contrib/seeds/generate-seeds.py +++ b/contrib/seeds/generate-seeds.py @@ -128,10 +128,10 @@ def main(): g.write(' * IPv4 as well as onion addresses are wrapped inside an IPv6 address accordingly.\n') g.write(' */\n') with open(os.path.join(indir,'nodes_main.txt'), 'r', encoding="utf8") as f: - process_nodes(g, f, 'pnSeed6_main', 17777) + process_nodes(g, f, 'pnSeed6_main', 36779) g.write('\n') with open(os.path.join(indir,'nodes_test.txt'), 'r', encoding="utf8") as f: - process_nodes(g, f, 'pnSeed6_test', 27777) + process_nodes(g, f, 'pnSeed6_test', 46779) g.write('#endif // BITCOIN_CHAINPARAMSSEEDS_H\n') if __name__ == '__main__': diff --git a/contrib/spendfrom/spendfrom.py b/contrib/spendfrom/spendfrom.py index a77a84199..6053ae0df 100755 --- a/contrib/spendfrom/spendfrom.py +++ b/contrib/spendfrom/spendfrom.py @@ -67,7 +67,7 @@ def connect_JSON(config): testnet = config.get('testnet', '0') testnet = (int(testnet) > 0) # 0/1 in config file, convert to True/False if not 'rpcport' in config: - config['rpcport'] = 47778 if testnet else 47777 + config['rpcport'] = 46780 if testnet else 36780 connect = "http://%s:%s@127.0.0.1:%s"%(config['rpcuser'], config['rpcpassword'], config['rpcport']) try: result = ServiceProxy(connect) diff --git a/doc/REST-interface.md b/doc/REST-interface.md index 4d81a97fa..7371425e2 100644 --- a/doc/REST-interface.md +++ b/doc/REST-interface.md @@ -89,4 +89,4 @@ Only supports JSON as output format. Risks ------------- -Running a web browser on the same node with a REST enabled pivxd can be a risk. Accessing prepared XSS websites could read out tx/block data of your node by placing links like `