Merge pull request #16 from MattF42/private-send-recalibration

Private send recalibration
MattF42 · Sep 2, 2023 · 007ee38 · 007ee38
2 parents 79164b5 + 1f5bc9c
commit 007ee38
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 10 deletions.
diff --git a/configure.ac b/configure.ac
@@ -1,9 +1,9 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 2)
-define(_CLIENT_VERSION_MINOR, 2)
+define(_CLIENT_VERSION_MINOR, 3)
 define(_CLIENT_VERSION_REVISION, 1)
-define(_CLIENT_VERSION_BUILD, 6)
+define(_CLIENT_VERSION_BUILD, 1)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2023)
 AC_INIT([PEPEPOW Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/PEPEPOWpay/PEPEPOW/issues],[PEPEPOWcore])

diff --git a/src/instantx.h b/src/instantx.h
@@ -28,7 +28,7 @@ extern CInstantSend instantsend;
 static const int INSTANTSEND_CONFIRMATIONS_REQUIRED = 6;
 static const int DEFAULT_INSTANTSEND_DEPTH          = 5;
 
-static const int MIN_INSTANTSEND_PROTO_VERSION      = 70301;
+static const int MIN_INSTANTSEND_PROTO_VERSION      = 70311;
 
 // For how long we are going to accept votes/locks
 // after we saw the first one for a specific transaction

diff --git a/src/privatesend-client.h b/src/privatesend-client.h
@@ -16,7 +16,7 @@ class CConnman;
 static const int DENOMS_COUNT_MAX                   = 100;
 
 static const int DEFAULT_PRIVATESEND_ROUNDS         = 2;
-static const int DEFAULT_PRIVATESEND_AMOUNT         = 1000;
+static const int DEFAULT_PRIVATESEND_AMOUNT         = 100000;
 static const int DEFAULT_PRIVATESEND_LIQUIDITY      = 0;
 static const bool DEFAULT_PRIVATESEND_MULTISESSION  = false;
 

diff --git a/src/privatesend.cpp b/src/privatesend.cpp
@@ -163,14 +163,12 @@ void CPrivateSend::InitStandardDenominations()
         1DRK+1000 == (.1DRK+100)*10
         10DRK+10000 == (1DRK+1000)*10
     */
-    /* Disabled
-    vecStandardDenominations.push_back( (10000000      * COIN)+10000000000 );
+
     vecStandardDenominations.push_back( (1000000      * COIN)+1000000000 );
     vecStandardDenominations.push_back( (100000      * COIN)+100000000 );
     vecStandardDenominations.push_back( (10000      * COIN)+10000000 );
     vecStandardDenominations.push_back( (1000      * COIN)+1000000 );
     vecStandardDenominations.push_back( (100      * COIN)+100000 );
-    */
     vecStandardDenominations.push_back( (10       * COIN)+10000 );
     vecStandardDenominations.push_back( (1        * COIN)+1000 );
     vecStandardDenominations.push_back( (.1       * COIN)+100 );

diff --git a/src/privatesend.h b/src/privatesend.h
@@ -23,7 +23,7 @@ static const int PRIVATESEND_QUEUE_TIMEOUT          = 30;
 static const int PRIVATESEND_SIGNING_TIMEOUT        = 15;
 
 //! minimum peer version accepted by mixing pool
-static const int MIN_PRIVATESEND_PEER_PROTO_VERSION = 70301;
+static const int MIN_PRIVATESEND_PEER_PROTO_VERSION = 70311;
 
 static const CAmount PRIVATESEND_ENTRY_MAX_SIZE     = 9;
 

diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui
@@ -263,7 +263,7 @@
             <number>2</number>
            </property>
            <property name="maximum">
-            <number>2000</number>
+            <number>1000000</number>
            </property>
            <property name="singleStep">
             <number>10</number>

diff --git a/src/version.h b/src/version.h
@@ -10,7 +10,7 @@
  * network protocol versioning
  */
 
-static const int PROTOCOL_VERSION = 70301;
+static const int PROTOCOL_VERSION = 70311;
 
 //! initial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 209;