.

src/komodo_bitcoind.h

@@ -1917,33 +1917,37 @@ uint64_t komodo_notarypay(CMutableTransaction &txNew, std::vector<int8_t> &Notar
     return(total);
 }
 
-uint64_t komodo_checknotarypay(CBlock *pblock,int32_t height)
+bool GetNotarisationNotaries(uint8_t notarypubkeys[64][33], int8_t &numNN, const std::vector<CTxIn> &vin, std::vector<int8_t> &NotarisationNotaries)
 {
-    std::vector<int8_t> NotarisationNotaries;
-    uint32_t timestamp = pblock->nTime;
-    int8_t numSN = 0; uint8_t notarypubkeys[64][33] = {0};
-    numSN = komodo_notaries(notarypubkeys, height, timestamp);
-
-    // No point going further, no notaries can be paid.
-    if ( notarypubkeys[0][0] == 0 )
-        return(0);
-    
     uint8_t *script; int32_t scriptlen;
-    // Loop over the notarisation and extract the position of the participating notaries in the array of pukeys for this era.
-    BOOST_FOREACH(const CTxIn& txin, pblock->vtx[1].vin)
+    if ( notarypubkeys[0][0] == 0 )
+        return false;
+    BOOST_FOREACH(const CTxIn& txin, vin)
     {
         uint256 hash; CTransaction tx1;
         if ( GetTransaction(txin.prevout.hash,tx1,hash,false) )
         {
-            for (int8_t i = 0; i < numSN; i++) 
+            for (int8_t i = 0; i < numNN; i++) 
             {
                 script = (uint8_t *)&tx1.vout[txin.prevout.n].scriptPubKey[0];
                 scriptlen = (int32_t)tx1.vout[txin.prevout.n].scriptPubKey.size();
                 if ( scriptlen == 35 && script[0] == 33 && script[34] == OP_CHECKSIG && memcmp(script+1,notarypubkeys[i],33) == 0 )
                     NotarisationNotaries.push_back(i);
             }
-        }
+        } else return false;
     }
+    return true;
+}
+
+uint64_t komodo_checknotarypay(CBlock *pblock,int32_t height)
+{
+    std::vector<int8_t> NotarisationNotaries; uint8_t *script; int32_t scriptlen;
+    uint64_t timestamp = pblock->nTime;
+    int8_t numSN = 0; uint8_t notarypubkeys[64][33] = {0};
+    numSN = komodo_notaries(notarypubkeys, height, timestamp);
+    if ( !GetNotarisationNotaries(notarypubkeys, numSN, pblock->vtx[1].vin, NotarisationNotaries) )
+        return(0);
+    
     // check a notary didnt sign twice (this would be an invalid notarisation later on and cause problems)
     std::set<int> checkdupes( NotarisationNotaries.begin(), NotarisationNotaries.end() );
     if ( checkdupes.size() != NotarisationNotaries.size() ) {

src/rpc/client.cpp

@@ -171,6 +171,7 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "assetchainproof", 1},
     { "crosschainproof", 1},
     { "getproofroot", 2},
+    { "getNotarisationsForBlock", 0},
     { "height_MoM", 1},
     { "calc_MoM", 2},
 };

src/rpc/crosschain.cpp

@@ -33,6 +33,7 @@
 #include "script/script_error.h"
 #include "script/sign.h"
 #include "script/standard.h"
+#include "notaries_staked.h"
 
 #include "key_io.h"
 
@@ -49,6 +50,7 @@ int32_t komodo_MoM(int32_t *notarized_htp,uint256 *MoMp,uint256 *kmdtxidp,int32_
 int32_t komodo_MoMoMdata(char *hexstr,int32_t hexsize,struct komodo_ccdataMoMoM *mdata,char *symbol,int32_t kmdheight,int32_t notarized_height);
 struct komodo_ccdata_entry *komodo_allMoMs(int32_t *nump,uint256 *MoMoMp,int32_t kmdstarti,int32_t kmdendi);
 uint256 komodo_calcMoM(int32_t height,int32_t MoMdepth);
+int32_t komodo_notaries(uint8_t pubkeys[64][33],int32_t height,uint32_t timestamp);
 extern std::string ASSETCHAINS_SELFIMPORT;
 uint256 Parseuint256(char *hexstr);
 
@@ -406,7 +408,63 @@ UniValue selfimport(const UniValue& params, bool fHelp)
     return result;
 }
 
+bool GetNotarisationNotaries(uint8_t notarypubkeys[64][33], int8_t &numNN, const std::vector<CTxIn> &vin, std::vector<int8_t> &NotarisationNotaries);
+
 UniValue getNotarisationsForBlock(const UniValue& params, bool fHelp)
+{
+    // TODO take timestamp as param, and loop blockindex to get starting/finish height.
+    if (fHelp || params.size() != 1)
+        throw runtime_error("getNotarisationsForBlock height\n\n"
+                "Takes a block height and returns notarisation information "
+                "within the block");
+
+    LOCK(cs_main);
+    int32_t height = params[0].get_int();
+    if ( height < 0 || height > chainActive.Height() )
+        throw runtime_error("height out of range.\n");
+    
+    uint256 blockHash = chainActive[height]->GetBlockHash(); 
+    
+    NotarisationsInBlock nibs;
+    GetBlockNotarisations(blockHash, nibs);
+    UniValue out(UniValue::VOBJ);
+    //out.push_back(make_pair("blocktime",(int)));
+    UniValue labs(UniValue::VARR);
+    UniValue kmd(UniValue::VARR);
+    // Gets KMD notaries on KMD... but LABS notaries on labs chains needs to be fixed so LABS are identified on KMD.
+    int8_t numNN = 0; uint8_t notarypubkeys[64][33] = {0};
+    numNN = komodo_notaries(notarypubkeys, height, chainActive[height]->nTime);
+    
+    BOOST_FOREACH(const Notarisation& n, nibs)
+    {
+        UniValue item(UniValue::VOBJ); UniValue notaryarr(UniValue::VARR); std::vector<int8_t> NotarisationNotaries;
+        if ( is_STAKED(n.second.symbol) != 0 )
+            continue; // for now just skip this... need to fetch diff pubkeys for these chains. labs.push_back(item);
+        uint256 hash; CTransaction tx;
+        if ( GetTransaction(n.first,tx,hash,false) )
+        {
+            if ( !GetNotarisationNotaries(notarypubkeys, numNN, tx.vin, NotarisationNotaries) )
+                continue;
+            if ( NotarisationNotaries.size() < numNN/5 )
+                continue;
+        }
+        item.push_back(make_pair("txid", n.first.GetHex()));
+        item.push_back(make_pair("chain", n.second.symbol));
+        item.push_back(make_pair("height", (int)n.second.height));
+        item.push_back(make_pair("blockhash", n.second.blockHash.GetHex()));
+        item.push_back(make_pair("KMD_height", height)); // for when timstamp input is used.
+        
+        for ( auto notary : NotarisationNotaries )
+            notaryarr.push_back(notary);
+        item.push_back(make_pair("notaries",notaryarr));
+        kmd.push_back(item);
+    }
+    out.push_back(make_pair("KMD", kmd));
+    //out.push_back(make_pair("LABS", labs));
+    return out;
+}
+
+/*UniValue getNotarisationsForBlock(const UniValue& params, bool fHelp)
 {
     if (fHelp || params.size() != 1)
         throw runtime_error("getNotarisationsForBlock blockHash\n\n"
@@ -426,7 +484,7 @@ UniValue getNotarisationsForBlock(const UniValue& params, bool fHelp)
         out.push_back(item);
     }
     return out;
-}
+}*/
 
 
 UniValue scanNotarisationsDB(const UniValue& params, bool fHelp)