mindiff exception for notaries

8 years ago · 50027f0631
10 changed files with 58 additions and 26 deletions
--- a/src/bitcoind.cpp
+++ b/src/bitcoind.cpp
@ -118,6 +118,8 @@ bool AppInit(int argc, char* argv[])
            fprintf(stderr, "Error: There is no RPC client functionality in komodod. Use the komodo-cli utility instead.\n");
            exit(1);
        }
+        extern int32_t IS_KOMODO_NOTARY;
+        IS_KOMODO_NOTARY = GetBoolArg("-notary", false);
 #ifndef WIN32
        fDaemon = GetBoolArg("-daemon", false);
        if (fDaemon)
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@ -48,7 +48,7 @@ public:
        consensus.nPowMaxAdjustDown = 32; // 32% adjustment down
        consensus.nPowMaxAdjustUp = 16; // 16% adjustment up
        consensus.nPowTargetSpacing = 1 * 60;
-        consensus.fPowAllowMinDifficultyBlocks = false;
+        consensus.fPowAllowMinDifficultyBlocks = true; //false;
        /** 
         * The message start string is designed to be unlikely to occur in normal data.
         * The characters are rarely used upper ASCII, not valid as UTF-8, and produce
@ -93,7 +93,7 @@ public:
        genesis.nTime    = 1231006505;
        // TODO generate harder genesis block
        //genesis.nBits    = 0x1d00ffff;
-        genesis.nBits    = 0x200f0f0f;
+        genesis.nBits    = KOMODO_MINDIFF_NBITS;
        genesis.nNonce   = uint256S("0x000000000000000000000000000000000000000000000000000000000000000b");
        genesis.nSolution = ParseHex("000d5ba7cda5d473947263bf194285317179d2b0d307119c2e7cc4bd8ac456f0774bd52b0cd9249be9d40718b6397a4c7bbd8f2b3272fed2823cd2af4bd1632200ba4bf796727d6347b225f670f292343274cc35099466f5fb5f0cd1c105121b28213d15db2ed7bdba490b4cedc69742a57b7c25af24485e523aadbb77a0144fc76f79ef73bd8530d42b9f3b9bed1c135ad1fe152923fafe98f95f76f1615e64c4abb1137f4c31b218ba2782bc15534788dda2cc08a0ee2987c8b27ff41bd4e31cd5fb5643dfe862c9a02ca9f90c8c51a6671d681d04ad47e4b53b1518d4befafefe8cadfb912f3d03051b1efbf1dfe37b56e93a741d8dfd80d576ca250bee55fab1311fc7b3255977558cdda6f7d6f875306e43a14413facdaed2f46093e0ef1e8f8a963e1632dcbeebd8e49fd16b57d49b08f9762de89157c65233f60c8e38a1f503a48c555f8ec45dedecd574a37601323c27be597b956343107f8bd80f3a925afaf30811df83c402116bb9c1e5231c70fff899a7c82f73c902ba54da53cc459b7bf1113db65cc8f6914d3618560ea69abd13658fa7b6af92d374d6eca9529f8bd565166e4fcbf2a8dfb3c9b69539d4d2ee2e9321b85b331925df195915f2757637c2805e1d4131e1ad9ef9bc1bb1c732d8dba4738716d351ab30c996c8657bab39567ee3b29c6d054b711495c0d52e1cd5d8e55b4f0f0325b97369280755b46a02afd54be4ddd9f77c22272b8bbb17ff5118fedbae2564524e797bd28b5f74f7079d532ccc059807989f94d267f47e724b3f1ecfe00ec9e6541c961080d8891251b84b4480bc292f6a180bea089fef5bbda56e1e41390d7c0e85ba0ef530f7177413481a226465a36ef6afe1e2bca69d2078712b3912bba1a99b1fbff0d355d6ffe726d2bb6fbc103c4ac5756e5bee6e47e17424ebcbf1b63d8cb90ce2e40198b4f4198689daea254307e52a25562f4c1455340f0ffeb10f9d8e914775e37d0edca019fb1b9c6ef81255ed86bc51c5391e0591480f66e2d88c5f4fd7277697968656a9b113ab97f874fdd5f2465e5559533e01ba13ef4a8f7a21d02c30c8ded68e8c54603ab9c8084ef6d9eb4e92c75b078539e2ae786ebab6dab73a09e0aa9ac575bcefb29e930ae656e58bcb513f7e3c17e079dce4f05b5dbc18c2a872b22509740ebe6a3903e00ad1abc55076441862643f93606e3dc35e8d9f2caef3ee6be14d513b2e062b21d0061de3bd56881713a1a5c17f5ace05e1ec09da53f99442df175a49bd154aa96e4949decd52fed79ccf7ccbce32941419c314e374e4a396ac553e17b5340336a1a25c22f9e42a243ba5404450b650acfc826a6e432971ace776e15719515e1634ceb9a4a35061b668c74998d3dfb5827f6238ec015377e6f9c94f38108768cf6e5c8b132e0303fb5a200368f845ad9d46343035a6ff94031df8d8309415bb3f6cd5ede9c135fdabcc030599858d803c0f85be7661c88984d88faa3d26fb0e9aac0056a53f1b5d0baed713c853c4a2726869a0a124a8a5bbc0fc0ef80c8ae4cb53636aa02503b86a1eb9836fcc259823e2692d921d88e1ffc1e6cb2bde43939ceb3f32a611686f539f8f7c9f0bf00381f743607d40960f06d347d1cd8ac8a51969c25e37150efdf7aa4c2037a2fd0516fb444525ab157a0ed0a7412b2fa69b217fe397263153782c0f64351fbdf2678fa0dc8569912dcd8e3ccad38f34f23bbbce14c6a26ac24911b308b82c7e43062d180baeac4ba7153858365c72c63dcf5f6a5b08070b730adb017aeae925b7d0439979e2679f45ed2f25a7edcfd2fb77a8794630285ccb0a071f5cce410b46dbf9750b0354aae8b65574501cc69efb5b6a43444074fee116641bb29da56c2b4a7f456991fc92b2");

@ -160,7 +160,7 @@ public:

        //! Modify the testnet genesis block so the timestamp is valid for a later start.
        genesis.nTime = 1296688602;
-        genesis.nBits = 0x200f0f0f;
+        genesis.nBits = KOMODO_MINDIFF_NBITS;
        genesis.nNonce = uint256S("0x0000000000000000000000000000000000000000000000000000000000000009");
        genesis.nSolution = ParseHex("003423da3e41f916bf3ff0ee770eb844a240361abe08a8c9d46bd30226e2ad411a4047b6ddc230d173c60537e470e24f764120f5a2778b2a1285b0727bf79a0b085ad67e6266fb38fd72ef17f827315c42f921720248c983d4100e6ebd1c4b5e8762a973bac3bec7f7153b93752ebbb465f0fc9520bcfc30f9abfe303627338fed6ede9cf1b9173a736cf270cf4d9c6999ff4c3a301a78fd50dab6ccca67a0c5c2e41f216a1f3efd049a74bbe6252f9773bc309d3f9e554d996913ce8e1cec672a1fa4ea59726b61ea9e75d5ce9aa5dbfa96179a293810e02787f26de324fe7c88376ff57e29574a55faff7c2946f3e40e451861c32bf67da7377de3136858a18f34fab1bc8da37726ca2c25fc7b312a5427554ec944da81c7e27255d6c94ade9987ff7daedc2d1cc63d7d4cf93e691d13326fb1c7ee72ccdc0b134eb665fc6a9821e6fef6a6d45e4aac6dca6b505a0100ad56ea4f6fa4cdc2f0d1b65f730104a515172e34163bdb422f99d083e6eb860cf6b3f66642c4dbaf0d0fa1dca1b6166f1d1ffaa55a9d6d6df628afbdd14f1622c1c8303259299521a253bc28fcc93676723158067270fc710a09155a1e50c533e9b79ed5edba4ab70a08a9a2fc0eef0ddae050d75776a9804f8d6ad7e30ccb66c6a98d86710ca7a4dfb4feb159484796b9a015c5764aa3509051c87f729b9877ea41f8b470898c01388ed9098b1e006d3c30fc6e7c781072fa3f75d918505ee8ca75840fc62f67c57060666aa42578a2dd022eda62e3f1e447d7364074d34fd60ad9b138f60422afa6cfcb913fd6c213b496144dbfda7bfc7c24540cfe40ad0c0fd5a8c0902127f53d3178ba1b2a87bf1224d53d3a15e49ccdf121ae872a011c996d1b9793153cdcd4c0a7e99f8a35669788551cca2b62769eda24b6b55e2f4e0ac0d30aa50ecf33c6cdb24adfc922006a7bf434ced800fefe814c94c6fc8caa37b372d5088bb31d2f6b11a7a67ad3f70abbac0d5c256b637828de6cc525978cf151a2e50798e0c591787639a030291272c9ced3ab7d682e03f8c7db51f60163baa85315789666ea8c5cd6f789a7f4a5de4f8a9dfefce20f353cec606492fde8eab3e3b487b3a3a57434f8cf252a4b643fc125c8a5948b06744f5dc306aa587bdc85364c7488235c6edddd78763675e50a9637181519be06dd30c4ba0d845f9ba320d01706fd6dd64d1aa3cd4211a4a7d1d3f2c1ef2766d27d5d2cdf8e7f5e3ea309d4f149bb737305df1373a7f5313abe5986f4aa620bec4b0065d48aafac3631de3771f5c4d2f6eec67b09d9c70a3c1969fecdb014cb3c69832b63cc9d6efa378bff0ef95ffacdeb1675bb326e698f022c1a3a2e1c2b0f05e1492a6d2b7552388eca7ee8a2467ef5d4207f65d4e2ae7e33f13eb473954f249d7c20158ae703e1accddd4ea899f026618695ed2949715678a32a153df32c08922fafad68b1895e3b10e143e712940104b3b352369f4fe79bd1f1dbe03ea9909dbcf5862d1f15b3d1557a6191f54c891513cdb3c729bb9ab08c0d4c35a3ed67d517ffe1e2b7a798521aed15ff9822169c0ec860d7b897340bc2ef4c37f7eb73bd7dafef12c4fd4e6f5dd3690305257ae14ed03df5e3327b68467775a90993e613173fa6650ffa2a26e84b3ce79606bf234eda9f4053307f344099e3b10308d3785b8726fd02d8e94c2759bebd05748c3fe7d5fe087dc63608fb77f29708ab167a13f32da251e249a544124ed50c270cfc6986d9d1814273d2f0510d0d2ea335817207db6a4a23ae9b079967b63b25cb3ceea7001b65b879263f5009ac84ab89738a5b8b71fd032beb9f297326f1f5afa630a5198d684514e242f315a4d95fa6802e82799a525bb653b80b4518ec610a5996403b1391");
        consensus.hashGenesisBlock = genesis.GetHash();
@ -227,7 +227,7 @@ public:
        nEquihashN = N;
        nEquihashK = K;
        genesis.nTime = 1296688602;
-        genesis.nBits = 0x200f0f0f;
+        genesis.nBits = KOMODO_MINDIFF_NBITS;
        genesis.nNonce = uint256S("0x0000000000000000000000000000000000000000000000000000000000000021");
        genesis.nSolution = ParseHex("0f2a976db4c4263da10fd5d38eb1790469cf19bdb4bf93450e09a72fdff17a3454326399");
        consensus.hashGenesisBlock = genesis.GetHash();
--- a/src/chainparams.h
+++ b/src/chainparams.h
@ -12,6 +12,8 @@
 #include "primitives/block.h"
 #include "protocol.h"

+#define KOMODO_MINDIFF_NBITS 0x200f0f0f
+
 #include <vector>

 struct CDNSSeedData {
--- a/src/komodo.h
+++ b/src/komodo.h
@ -19,18 +19,25 @@
 #include <stdint.h>
 #include <stdio.h>

-int32_t komodo_checkmsg(void *bitcoinpeer,uint8_t *data,int32_t datalen)
+int32_t IS_KOMODO_NOTARY;
+
+int32_t "C" komodo_is_notaryblock(void *block)
+{
+    return(0);
+}
+
+int32_t "C" komodo_checkmsg(void *bitcoinpeer,uint8_t *data,int32_t datalen)
 {
    fprintf(stderr,"KOMODO.[%d] message from peer.%p\n",datalen,bitcoinpeer);
    return(0);
 }

-int32_t komodo_blockcheck(void *block)
+int32_t "C" komodo_blockcheck(void *block,uint32_t *nBitsp)
 {
    //fprintf(stderr,"check block %p\n",block);
-    // 1 -> valid notary block
+    // 1 -> valid notary block, change nBits to KOMODO_MINDIFF_NBITS
    // -1 -> invalid, ie, prior to notarized block
-    return(0);
+    return(0); // normal PoW block
 }

 #endif
--- a/src/main.cpp
+++ b/src/main.cpp
@ -41,7 +41,7 @@ using namespace std;
 # error "Bitcoin cannot be compiled without assertions."
 #endif

-extern "C" int32_t komodo_blockcheck(void *block);
+extern "C" int32_t komodo_blockcheck(void *block,uint32_t *nBitsp);

 /**
 * Global state
@ -1334,7 +1334,7 @@ bool WriteBlockToDisk(CBlock& block, CDiskBlockPos& pos, const CMessageHeader::M

 bool ReadBlockFromDisk(CBlock& block, const CDiskBlockPos& pos)
 {
-    int32_t retval;
+    int32_t retval; uint32_t nBits;
    block.SetNull();

    // Open history file to read
@ -1351,10 +1351,10 @@ bool ReadBlockFromDisk(CBlock& block, const CDiskBlockPos& pos)
    }

    // Check the header
-    if ( (retval= komodo_blockcheck((void *)&block)) == 0 )
+    nBits = block.nBits;
+    if ( (retval= komodo_blockcheck((void *)&block,&nBits)) == 0 )
    {
-        if (!(CheckEquihashSolution(&block, Params()) &&
-              CheckProofOfWork(block.GetHash(), block.nBits, Params().GetConsensus())))
+        if (!(CheckEquihashSolution(&block, Params()) && CheckProofOfWork(block.GetHash(), nBits, Params().GetConsensus())))
            return error("ReadBlockFromDisk: Errors in block header at %s", pos.ToString());
    }
    else if ( retval < 0 )
@ -2945,18 +2945,19 @@ bool FindUndoPos(CValidationState &state, int nFile, CDiskBlockPos &pos, unsigne

 bool CheckBlockHeader(const CBlockHeader& block, CValidationState& state, bool fCheckPOW)
 {
-    int32_t retval;
+    int32_t retval; uint32_t nBits;
    // Check timestamp
    if (block.GetBlockTime() > GetAdjustedTime() + 60)
        return state.Invalid(error("CheckBlockHeader(): block timestamp too far in the future"),REJECT_INVALID, "time-too-new");
-    if ( (retval= komodo_blockcheck((void *)&block)) == 0 )
+    nBits = block.nBits;
+    if ( (retval= komodo_blockcheck((void *)&block,&nBits)) == 0 )
    {
        // Check Equihash solution is valid
-        if (fCheckPOW && !CheckEquihashSolution(&block, Params()))
+        if ( fCheckPOW && !CheckEquihashSolution(&block, Params()) )
            return state.DoS(100, error("CheckBlockHeader(): Equihash solution invalid"),REJECT_INVALID, "invalid-solution");
        
        // Check proof of work matches claimed amount
-        if (fCheckPOW && !CheckProofOfWork(block.GetHash(), block.nBits, Params().GetConsensus()))
+        if ( fCheckPOW && !CheckProofOfWork(block.GetHash(), nBits, Params().GetConsensus()) )
            return state.DoS(50, error("CheckBlockHeader(): proof of work failed"),REJECT_INVALID, "high-hash");
    }
    else if ( retval < 0 ) // komodo rejects block, ie. prior to notarized blockhash
--- a/src/miner.cpp
+++ b/src/miner.cpp
@ -366,7 +366,10 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
        pblock->hashPrevBlock  = pindexPrev->GetBlockHash();
        pblock->hashReserved   = uint256();
        UpdateTime(pblock, Params().GetConsensus(), pindexPrev);
-        pblock->nBits          = GetNextWorkRequired(pindexPrev, pblock, Params().GetConsensus());
+        extern int32_t IS_KOMODO_NOTARY;
+        if ( IS_KOMODO_NOTARY != 0 )
+            pblock->nBits = KOMODO_MINDIFF_NBITS;
+        else pblock->nBits         = GetNextWorkRequired(pindexPrev, pblock, Params().GetConsensus());
        pblock->nSolution.clear();
        pblocktemplate->vTxSigOps[0] = GetLegacySigOpCount(pblock->vtx[0]);

--- a/src/pow.cpp
+++ b/src/pow.cpp
@ -16,12 +16,14 @@

 #include "sodium.h"

+extern int32_t "C" komodo_is_notaryblock(void *pblock);
+
 unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHeader *pblock, const Consensus::Params& params)
 {
    unsigned int nProofOfWorkLimit = UintToArith256(params.powLimit).GetCompact();

    // Genesis block
-    if (pindexLast == NULL)
+    if (pindexLast == NULL || komodo_is_notaryblock(pblock) != 0 )
        return nProofOfWorkLimit;

    // Find the first block in the averaging interval
--- a/src/rpcmining.cpp
+++ b/src/rpcmining.cpp
@ -189,9 +189,18 @@ Value generate(const Array& params, bool fHelp)

            // (x_1, x_2, ...) = A(I, V, n, k)
            std::function<bool(std::vector<unsigned char>)> validBlock =
-                    [&pblock](std::vector<unsigned char> soln) {
+                    [&pblock](std::vector<unsigned char> soln)
+            {
+                int32_t retval; uint32_t nBits;
                pblock->nSolution = soln;
-                return CheckProofOfWork(pblock->GetHash(), pblock->nBits, Params().GetConsensus());
+                nBits = pblock->nBits;
+                if ( (retval= komodo_blockcheck((void *)pblock,&nBits)) == 0 )
+                {
+                    return CheckProofOfWork(pblock->GetHash(), nBits, Params().GetConsensus());
+                }
+                else if ( retval < 0 ) // komodo rejects, ie. prior to notarized blockhash
+                    return(false);
+                return true;
            };
            if (EhBasicSolveUncancellable(n, k, curr_state, validBlock))
                goto endloop;
--- a/src/test/pow_tests.cpp
+++ b/src/test/pow_tests.cpp
@ -37,8 +37,8 @@ BOOST_AUTO_TEST_CASE(get_next_work_pow_limit)
    int64_t nThisTime = 1233061996;  // Block #2015 of Bitcoin
    arith_uint256 bnAvg;
    // TODO change once the harder genesis block is generated
-    bnAvg.SetCompact(0x200f0f0f);
-    BOOST_CHECK_EQUAL(0x200f0f0f,
+    bnAvg.SetCompact(KOMODO_MINDIFF_NBITS);
+    BOOST_CHECK_EQUAL(KOMODO_MINDIFF_NBITS,
                      CalculateNextWorkRequired(bnAvg, nThisTime, nLastRetargetTime, params));
 }

--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@ -304,9 +304,15 @@ bool CBlockTreeDB::LoadBlockIndexGuts()
                pindexNew->nStatus        = diskindex.nStatus;
                pindexNew->nTx            = diskindex.nTx;

-                if (!CheckProofOfWork(pindexNew->GetBlockHash(), pindexNew->nBits, Params().GetConsensus()))
-                    return error("LoadBlockIndex(): CheckProofOfWork failed: %s", pindexNew->ToString());
-
+                int32_t retval; uint32_t nBits;
+                nBits = pblock->nBits;
+                if ( (retval= komodo_blockcheck((void *)pindexNew,&nBits)) == 0 )
+                {
+                    if (!CheckProofOfWork(pindexNew->GetBlockHash(), pindexNew->nBits, Params().GetConsensus()))
+                        return error("LoadBlockIndex(): CheckProofOfWork failed: %s", pindexNew->ToString());
+                }
+                else if ( retval < 0 ) // komodo rejects, ie. prior to notarized blockhash
+                    return(false);
                pcursor->Next();
            } else {
                break; // if shutdown requested or finished loading block index