Qortal/qortal
Qortal/qortal
3
0
Fork 3
mirror of https://github.com/Qortal/qortal.git synced 2025-02-12 02:05:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into block-sequence

Browse Source
This commit is contained in:
CalDescent 2023-05-21 15:35:50 +01:00
commit ba555174ba
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/qortal/network/Handshake.java
View File

@ -265,7 +265,7 @@ public enum Handshake {
private static final long PEER_VERSION_131 = 0x0100030001L; private static final long PEER_VERSION_131 = 0x0100030001L;
/** Minimum peer version that we are allowed to communicate with */ /** Minimum peer version that we are allowed to communicate with */
private static final String MIN_PEER_VERSION = "3.8.2"; private static final String MIN_PEER_VERSION = "4.0.0";
private static final int POW_BUFFER_SIZE_PRE_131 = 8 * 1024 * 1024; // bytes private static final int POW_BUFFER_SIZE_PRE_131 = 8 * 1024 * 1024; // bytes
private static final int POW_DIFFICULTY_PRE_131 = 8; // leading zero bits private static final int POW_DIFFICULTY_PRE_131 = 8; // leading zero bits

8
src/main/java/org/qortal/settings/Settings.java
View File

@ -201,11 +201,11 @@ public class Settings {
/** Whether to attempt to open the listen port via UPnP */ /** Whether to attempt to open the listen port via UPnP */
private boolean uPnPEnabled = true; private boolean uPnPEnabled = true;
/** Minimum number of peers to allow block minting / synchronization. */ /** Minimum number of peers to allow block minting / synchronization. */
private int minBlockchainPeers = 5; private int minBlockchainPeers = 3;
/** Target number of outbound connections to peers we should make. */ /** Target number of outbound connections to peers we should make. */
private int minOutboundPeers = 16; private int minOutboundPeers = 16;
/** Maximum number of peer connections we allow. */ /** Maximum number of peer connections we allow. */
private int maxPeers = 36; private int maxPeers = 40;
/** Number of slots to reserve for short-lived QDN data transfers */ /** Number of slots to reserve for short-lived QDN data transfers */
private int maxDataPeers = 4; private int maxDataPeers = 4;
/** Maximum number of threads for network engine. */ /** Maximum number of threads for network engine. */
@ -216,10 +216,10 @@ public class Settings {
private int maxRetries = 2; private int maxRetries = 2;
/** The number of seconds of no activity before recovery mode begins */ /** The number of seconds of no activity before recovery mode begins */
public long recoveryModeTimeout = 10 * 60 * 1000L; public long recoveryModeTimeout = 24 * 60 * 60 * 1000L;
/** Minimum peer version number required in order to sync with them */ /** Minimum peer version number required in order to sync with them */
private String minPeerVersion = "3.8.7"; private String minPeerVersion = "4.0.0";
/** Whether to allow connections with peers below minPeerVersion /** Whether to allow connections with peers below minPeerVersion
* If true, we won't sync with them but they can still sync with us, and will show in the peers list * If true, we won't sync with them but they can still sync with us, and will show in the peers list
* If false, sync will be blocked both ways, and they will not appear in the peers list */ * If false, sync will be blocked both ways, and they will not appear in the peers list */