jl777 8 years ago
parent
commit
bf90b8a6c5
  1. 49
      deprecated/obsolete.h
  2. 1
      iguana/iguana_notary.c
  3. 3
      iguana/notaries.h
  4. 1
      iguana/tests/addnotarys_7776

49
deprecated/obsolete.h

@ -19569,3 +19569,52 @@ len = 0;
//printf("matches.%d num.%d k.%d %llx refht.%d\n",matches,num,refk,(long long)refmask,refheight);
return(matches);
}
/*int32_t komodo_blockindexcheck(CBlockIndex *pindex,uint32_t *nBitsp)
{
// 1 -> valid notary block, change nBits to KOMODO_MINDIFF_NBITS
// -1 -> invalid, ie, prior to notarized block
CBlock block; int32_t i,height; char *coinbasestr;
if ( pindex == 0 )
return(0);
if ( ReadBlockFromDisk(block,pindex,1) == 0 )
return(0);
if ( block.vtx.size() > 0 )
{
height = pindex->nHeight;
coinbasestr = (char *)block.vtx[0].vout[0].scriptPubKey.ToString().c_str();
for (i=0; i<64; i++)
{
if ( Notaries[i][0] == 0 || Notaries[i][1] == 0 || Notaries[i][0][0] == 0 || Notaries[i][1][0] == 0 )
break;
if ( strncmp(Notaries[i][1],coinbasestr,66) == 0 )
{
//printf("Notary.[%d] %s ht.%d (%s)\n",i,Notaries[i][0],height,coinbasestr);
//*nBitsp = KOMODO_MINDIFF_NBITS;
return(1);
}
}
}
// compare against elected notary pubkeys as of height
return(0);
}
int32_t komodo_is_notaryblock(CBlockHeader& blockhdr)
{
//uint32_t nBits = 0;
//return(komodo_blockindexcheck(mapBlockIndex[blockhdr.GetHash()],&nBits));
return(0);
}
int32_t komodo_blockhdrcheck(CBlockHeader& blockhdr,uint32_t *nBitsp)
{
int32_t retval;
if ( (retval= komodo_is_notaryblock(blockhdr)) > 0 )
*nBitsp = KOMODO_MINDIFF_NBITS;
return(retval);
}
int32_t komodo_blockcheck(CBlock& block,uint32_t *nBitsp)
{
return(komodo_blockhdrcheck(block,nBitsp));
}*/

1
iguana/iguana_notary.c

@ -17,7 +17,6 @@
// Todo list:
// a) award 5% APR for utxo older than a week when they are spent
// b) round robin mining difficulty
// q) investigate if rebroadcast reorged local chain notary tx and scanning mempool is needed

3
iguana/notaries.h

@ -52,7 +52,8 @@ char *Notaries[][2] =
{ "kolo_EU", "03f5c08dadffa0ffcafb8dd7ffc38c22887bd02702a6c9ac3440deddcf2837692b" },
{ "artik_NA", "0224e31f93eff0cc30eaf0b2389fbc591085c0e122c4d11862c1729d090106c842" },
{ "eclips_EU", "0339369c1f5a2028d44be7be6f8ec3b907fdec814f87d2dead97cab4edb71a42e9" },
/*{ "Server1","0221876c8259764224dc1a7b70ec956f3fbe9a768cd77f13082cfa60eb6aa2d068"},
{ "titomane_SH", "035f49d7a308dd9a209e894321f010d21b7793461b0c89d6d9231a3fe5f68d9960" },
/*{ "Server1","0221876c8259764224dc1a7b70ec956f3fbe9a768cd77f13082cfa60eb6aa2d068"},
{ "Server2","03c7c14e6b1f94585bb571cf3ee5eb9b9ab54bd23d0acb8cf13edad1c515842b66"},
{ "Server3","02d28f8992ff0cd68c5d558cf55ec5b3ada25151519a6cea8cef1bac04c40023b6"},
{ "Server4","02adc84814fee5864e67fd1b76f97fbe74d6bd07c62335e2f1da918f46d08d84ba"},

1
iguana/tests/addnotarys_7776

@ -4,6 +4,7 @@ curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"ad
curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"addnotary\",\"ipaddr\":\"191.235.80.138\"}"
curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"addnotary\",\"ipaddr\":\"52.72.135.200\"}"
curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"addnotary\",\"ipaddr\":\"94.102.63.226\"}"
curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"addnotary\",\"ipaddr\":\"129.232.225.202\"}"
curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"addnotary\",\"ipaddr\":\"104.255.64.3\"}"
curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"addnotary\",\"ipaddr\":\"163.172.68.112\"}"
curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"addnotary\",\"ipaddr\":\"149.56.122.76\"}"

Loading…
Cancel
Save