Tpos signature hf

configure.ac

@@ -2,10 +2,10 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 1)
 define(_CLIENT_VERSION_MINOR, 0)
-define(_CLIENT_VERSION_REVISION, 21)
+define(_CLIENT_VERSION_REVISION, 22)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
-define(_COPYRIGHT_YEAR, 2019)
+define(_COPYRIGHT_YEAR, 2020)
 define(_COPYRIGHT_HOLDERS,[The %s developers])
 define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[XSN Core]])
 AC_INIT([XSN Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/xsn/xsn/issues],[xsn],[https://xsncore.org/])

src/Makefile.test.include

@@ -83,6 +83,7 @@ BITCOIN_TESTS =\
   test/timedata_tests.cpp \
   test/torcontrol_tests.cpp \
   test/transaction_tests.cpp \
+  test/tpos_tests.cpp \
   test/txindex_tests.cpp \
   test/txvalidation_tests.cpp \
   test/txvalidationcache_tests.cpp \

src/XSNBtc.files

@@ -431,6 +431,7 @@ test/test_xsn_fuzzy.cpp
 test/test_xsn_main.cpp
 test/timedata_tests.cpp
 test/torcontrol_tests.cpp
+test/tpos_tests.cpp
 test/transaction_tests.cpp
 test/txvalidation_tests.cpp
 test/txvalidationcache_tests.cpp

src/blocksigner.cpp

@@ -20,18 +20,19 @@ static CPubKey::InputScriptType GetScriptTypeFromDestination(const CTxDestinatio
     return CPubKey::InputScriptType::SPENDUNKNOWN;
 }
 
-CBlockSigner::CBlockSigner(CBlock &block, const CKeyStore *keystore, const TPoSContract &contract) :
+CBlockSigner::CBlockSigner(CBlock &block, const CKeyStore *keystore, const TPoSContract &contract, int chainHeight) :
     refBlock(block),
     refKeystore(keystore),
-    refContract(contract)
+    refContract(contract),
+    nChainHeight(chainHeight)
 {
 
 }
 
 bool CBlockSigner::SignBlock()
 {
     CKey keySecret;
-    CPubKey::InputScriptType scriptType;
+    CPubKey::InputScriptType scriptType { CPubKey::InputScriptType::SPENDUNKNOWN };
 
     if(refBlock.IsProofOfStake())
     {
@@ -45,15 +46,18 @@ bool CBlockSigner::SignBlock()
 
         if(refBlock.IsTPoSBlock())
         {
-            CKeyID merchantKeyID;
-            if(!refContract.merchantAddress.GetKeyID(merchantKeyID))
+            if(!refContract.scriptMerchantAddress.IsPayToPublicKeyHash()) {
                 return error("CBlockSigner::SignBlock() : merchant address is not P2PKH, critical error, can't accept.");
+            }
+
+            CTxDestination dest;
+            ExtractDestination(refContract.scriptMerchantAddress, dest);
 
-            if(merchantKeyID != activeMerchantnode.pubKeyMerchantnode.GetID())
+            if(dest != CTxDestination(activeMerchantnode.pubKeyMerchantnode.GetID())) {
                 return error("CBlockSigner::SignBlock() : contract address is different from merchantnode address, won't sign.");
+            }
 
             scriptType = CPubKey::InputScriptType::SPENDP2PKH;
-
             keySecret = activeMerchantnode.keyMerchantnode;
         }
         else
@@ -69,8 +73,13 @@ bool CBlockSigner::SignBlock()
             scriptType = GetScriptTypeFromDestination(destination);
         }
     }
-//?
-    return CHashSigner::SignHash(refBlock.IsTPoSBlock() ? refBlock.GetTPoSHash() : refBlock.GetHash(), keySecret, scriptType, refBlock.vchBlockSig);
+
+    const auto &hash = refBlock.IsTPoSBlock() ? refBlock.GetTPoSHash() : refBlock.GetHash();
+    if (IsTPoSNewSignaturesHardForkActivated(nChainHeight)) {
+        return CMessageSigner::SignMessage(std::string(hash.begin(), hash.end()), refBlock.vchBlockSig, keySecret, scriptType);
+    } else {
+        return CHashSigner::SignHash(hash, keySecret, scriptType, refBlock.vchBlockSig);
+    }
 }
 
 bool CBlockSigner::CheckBlockSignature() const
@@ -85,24 +94,26 @@ bool CBlockSigner::CheckBlockSignature() const
 
     CTxDestination destination;
 
-    if(!ExtractDestination(txout.scriptPubKey, destination))
-    {
+    if(!ExtractDestination(txout.scriptPubKey, destination)) {
         return error("CBlockSigner::CheckBlockSignature() : failed to extract destination from script: %s", txout.scriptPubKey.ToString());
     }
 
     auto hashMessage = refBlock.IsTPoSBlock() ? refBlock.GetTPoSHash() : refBlock.GetHash();
-    if(refBlock.IsProofOfStake())
-    {
-        if(refBlock.IsTPoSBlock())
-        {
-            destination = refContract.merchantAddress.Get();
+    if(refBlock.IsProofOfStake()) {
+        if(refBlock.IsTPoSBlock()) {
+            if (!ExtractDestination(refContract.scriptMerchantAddress, destination)) {
+                return error("CBlockSigner::CheckBlockSignature() : failed to extract destination from script: %s", refContract.scriptMerchantAddress.ToString());
+            }
         }
     }
-    else
-    {
+    else {
         return true;
     }
 
     std::string strError;
-    return CHashSigner::VerifyHash(hashMessage, destination, refBlock.vchBlockSig, strError);
+    if (IsTPoSNewSignaturesHardForkActivated(nChainHeight)) {
+        return CMessageSigner::VerifyMessage(destination, refBlock.vchBlockSig, std::string(hashMessage.begin(), hashMessage.end()), strError);
+    } else {
+        return CHashSigner::VerifyHash(hashMessage, destination, refBlock.vchBlockSig, strError);
+    }
 }

src/blocksigner.h

@@ -9,13 +9,14 @@ class CKeyStore;
 
 struct CBlockSigner {
 
-    CBlockSigner(CBlock &block, const CKeyStore *keystore, const TPoSContract &contract);
+    CBlockSigner(CBlock &block, const CKeyStore *keystore, const TPoSContract &contract, int chainHeight);
 
     bool SignBlock();
     bool CheckBlockSignature() const;
 
     CBlock &refBlock;
     const CKeyStore *refKeystore;
     const TPoSContract &refContract;
+    int nChainHeight{0};
 };
 #endif // BLOCKSIGNER_H

src/chainparams.cpp

@@ -99,6 +99,7 @@ class CMainParams : public CChainParams {
         consensus.nPosTargetSpacing = 1 * 60; // XSN: 1 minutes
         consensus.nPosTargetTimespan = 60 * 40;
         consensus.nPoSUpdgradeHFHeight = 898488; // 4 December 2019
+        consensus.nTPoSSignatureUpgradeHFHeight = 1348224; // tpos signature update HF, 8 October 2020
         consensus.nMerchantnodeMinimumConfirmations = 1;
         consensus.nMasternodeMinimumConfirmations = 15;
         consensus.nStakeMinAge = 60 * 60;
@@ -110,6 +111,7 @@ class CMainParams : public CChainParams {
         consensus.nMaxBlockSpacingFixDeploymentHeight = 674980; // apprx 28 of June
         consensus.fPowAllowMinDifficultyBlocks = false;
         consensus.fPowNoRetargeting = false;
+        consensus.fPoSNoRetargeting = false;
         consensus.nRuleChangeActivationThreshold = 1080; // 75% of 2016
         consensus.nMinerConfirmationWindow = 1440; // nPowTargetTimespan / nPowTargetSpacing
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].bit = 28;
@@ -235,6 +237,7 @@ class CTestNetParams : public CChainParams {
         consensus.nMasternodeMinimumConfirmations = 1;
         consensus.nMerchantnodeMinimumConfirmations = 1;
         consensus.fPowNoRetargeting = false;
+        consensus.fPoSNoRetargeting = false;
         consensus.nPowKGWHeight = 4001; // nPowKGWHeight >= nPowDGWHeight means "no KGW"
         consensus.nPowDGWHeight = 4001;
         consensus.nMaxBlockSpacingFixDeploymentHeight = 0;
@@ -289,11 +292,6 @@ class CTestNetParams : public CChainParams {
 
         vFixedSeeds.clear();
         vSeeds.clear();
-        // nodes with support for servicebits filtering should be at the top
-//        vSeeds.emplace_back("testnet-seed.xsn.jonasschnelli.ch");
-//        vSeeds.emplace_back("seed.txsn.petertodd.org");
-//        vSeeds.emplace_back("seed.testnet.xsn.sprovoost.nl");
-//        vSeeds.emplace_back("testnet-seed.bluematt.me"); // Just a static list of stable node(s), only supports x9
 
         base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,140);
         base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,19);
@@ -360,13 +358,16 @@ class CRegTestParams : public CChainParams {
         consensus.nPowTargetSpacing = 1 * 60; // XSN: 1 minutes
         consensus.nPosTargetSpacing = 1 * 60; // PoSW: 1 minutes
         consensus.nPosTargetTimespan = 60 * 40;
+        consensus.nPoSUpdgradeHFHeight = 0;
+        consensus.nTPoSSignatureUpgradeHFHeight = 80;
         consensus.fPowAllowMinDifficultyBlocks = true;
         consensus.fPowNoRetargeting = true;
+        consensus.fPoSNoRetargeting = true;
         consensus.nPowKGWHeight = 4001; // nPowKGWHeight >= nPowDGWHeight means "no KGW"
         consensus.nPowDGWHeight = 4001;
         consensus.nLastPoWBlock = 75;
         consensus.nMaxBlockSpacingFixDeploymentHeight = 0;
-        consensus.nStakeMinAge = 60 * 60;
+        consensus.nStakeMinAge = 60;
         consensus.nStakeMaxAge = 60 * 60 * 24; // one day
         consensus.nCoinbaseMaturity = 20;
         consensus.nFirstBlocksEmpty = 0;
@@ -422,13 +423,13 @@ class CRegTestParams : public CChainParams {
             0
         };
 
-        base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,140);
-        base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,19);
-        base58Prefixes[SECRET_KEY] =     std::vector<unsigned char>(1,239);
-        base58Prefixes[EXT_PUBLIC_KEY] = {0x04, 0x35, 0x87, 0xCF};
-        base58Prefixes[EXT_SECRET_KEY] = {0x04, 0x35, 0x83, 0x94};
+        base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,76);
+        base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,16);
+        base58Prefixes[SECRET_KEY] =     std::vector<unsigned char>(1,204);
+        base58Prefixes[EXT_PUBLIC_KEY] = {0x04, 0x88, 0xB2, 0x1E};
+        base58Prefixes[EXT_SECRET_KEY] = {0x04, 0x88, 0xAD, 0xE4};
 
-        bech32_hrp = "bcrt";
+        bech32_hrp = "xc";
 
         /* enable fallback fee on regtest */
         m_fallback_fee_enabled = true;

src/consensus/params.h

@@ -84,6 +84,7 @@ struct Params {
     uint256 powLimit;
     bool fPowAllowMinDifficultyBlocks;
     bool fPowNoRetargeting;
+    bool fPoSNoRetargeting;
     int64_t nPowTargetSpacing;
     int64_t nPowTargetTimespan;
     int64_t nPosTargetSpacing;
@@ -101,6 +102,7 @@ struct Params {
     int nTPoSContractSignatureDeploymentTime;
     int nMaxBlockSpacingFixDeploymentHeight;
     int nPoSUpdgradeHFHeight;
+    int nTPoSSignatureUpgradeHFHeight;
 };
 } // namespace Consensus
 

src/httpserver.cpp

@@ -14,6 +14,7 @@
 #include <ui_interface.h>
 
 #include <memory>
+#include <queue>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

src/interfaces/wallet.cpp

@@ -242,7 +242,7 @@ class WalletImpl : public Wallet
     {
         LOCK2(cs_main, m_wallet.cs_wallet);
         auto pending = MakeUnique<PendingWalletTxImpl>(m_wallet);
-        if(!TPoSUtils::CreateTPoSTransaction(&m_wallet, pending->m_tx, pending->m_key, tpos_address, merchant_address, merchant_commission, fail_reason)) {
+        if(!TPoSUtils::CreateTPoSTransaction(&m_wallet, pending->m_tx, pending->m_key, tpos_address, merchant_address, merchant_commission, true, fail_reason)) {
             return {};
         }
         return std::move(pending);

src/key_io.h

@@ -42,7 +42,6 @@ class CBitcoinAddress {
 
     CTxDestination Get() const;
     bool GetKeyID(CKeyID &keyID) const;
-    bool GetIndexKey(uint160& hashBytes, int& type) const;
     bool IsScript() const;
     std::string ToString() const;
 

src/masternode-payments.cpp

@@ -1114,9 +1114,11 @@ void AdjustMasternodePayment(CMutableTransaction &tx, const CTxOut &txoutMastern
         int i = tx.vout.size() - 2;
         if(tposContract.IsValid()) // here we have 3 outputs, first as stake reward, second as tpos reward, third as MN reward
         {
-            masternodePayment /= 100; // to calculate percentage
-            tx.vout[i - 1].nValue -= masternodePayment * tposContract.stakePercentage; // adjust reward for owner.
-            tx.vout[i].nValue -= masternodePayment * (100 - tposContract.stakePercentage); // adjust reward for merchant
+            tx.vout[i - 1].nValue -= TPoSUtils::GetOwnerPayment(masternodePayment, tposContract.nOperatorReward); // adjust reward for owner.
+            // it might be that last vout is masternode, since operator reward was 0
+            if (tx.vout[i].scriptPubKey == tposContract.scriptMerchantAddress) {
+                tx.vout[i].nValue -= TPoSUtils::GetOperatorPayment(masternodePayment, tposContract.nOperatorReward); // adjust reward for merchant
+            }
         }
         else // here we have 2 outputs, first as stake reward, second as MN reward
         {