finished pow

This commit is contained in:
Evan 2014-01-11 10:18:50 -07:00
parent 360b68b4c8
commit f63038ac62
2 changed files with 12 additions and 4 deletions

View File

@ -31,7 +31,7 @@ CTxMemPool mempool;
unsigned int nTransactionsUpdated = 0;
map<uint256, CBlockIndex*> mapBlockIndex;
uint256 hashGenesisBlock("0xe4bda88bbd289f266060f8e3f19167e819278df379a32614cad9acf02dfcdb3c");
uint256 hashGenesisBlock("0x79183173cf612c431e3726f5c9c893f8670a081b976bac6d00094c74f7e2df3a");
static CBigNum bnProofOfWorkLimit(~uint256(0) >> 20); // Xcoin: starting difficulty is 1 / 2^12
CBlockIndex* pindexGenesisBlock = NULL;
int nBestHeight = -1;
@ -2770,7 +2770,7 @@ bool InitBlockIndex() {
block.nVersion = 1;
block.nTime = 1389401959;
block.nBits = 0x1e0ffff0;
block.nNonce = 21029584;
block.nNonce = 24329260;
if (fTestNet)
{

View File

@ -257,12 +257,20 @@ void shash(const char *input, char *output)
{
uint8_t B[128];
uint32_t X[32];
uint32_t k;
uint32_t i, j, k;
uint32_t *V;
PBKDF2_SHA256((const uint8_t *)input, 80, (const uint8_t *)input, 80, 1, B, 128);
for (k = 0; k < 32; k++)
X[k] = le32dec(&B[4 * k]);
X[k] = le32dec(&B[4 * k]);
for (k = 0; k < 16; k++){
for (i = 0; i < 16; i++){
xor_salsa8(&X[k+i], &X[k]);
xor_salsa8(&X[k], &X[k+i]);
}
}
for (k = 0; k < 32; k++)
le32enc(&B[4 * k], X[k]);