tiamak/node-cryptoforknote-util-salvium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed raven block processing

Browse Source
This commit is contained in:
MoneroOcean
2020-12-09 06:53:08 +00:00
parent 8729782845
commit 2c6f6e6dd2
2 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
index.js
View File

@@ -5,8 +5,7 @@ const bignum = require('bignum');
const bitcoin = require('bitcoinjs-lib'); const bitcoin = require('bitcoinjs-lib');
const varuint = require('varuint-bitcoin'); const varuint = require('varuint-bitcoin');
const crypto = require('crypto'); const crypto = require('crypto');
const promise = require('promise'); const fastMerkleRoot = require('merkle-lib/fastRoot');
const merklebitcoin = promise.denodeify(require('merkle-bitcoin'));
function scriptCompile(addrHash) { function scriptCompile(addrHash) {
return bitcoin.script.compile([ return bitcoin.script.compile([
@@ -37,22 +36,21 @@ function txesHaveWitnessCommit(transactions) {
); );
} }
function hash256(buffer) { function sha256(buffer) {
return crypto.createHash('sha256').update(buffer).digest(); return crypto.createHash('sha256').update(buffer).digest();
}; };
function hash256(buffer) {
return sha256(sha256(buffer));
};
function getMerkleRoot(transactions) { function getMerkleRoot(transactions) {
// error if (transactions.length === 0) return new Buffer('0000000000000000000000000000000000000000000000000000000000000000', 'hex')
if (transactions.length === 0) return new Buffer('0000000000000000000000000000000000000000000000000000000000000000', 'hex'); const forWitness = txesHaveWitnessCommit(transactions);
// coinbase tx only const hashes = transactions.map(transaction => transaction.getHash(forWitness));
const txhash0 = transactions[0].getHash(); const rootHash = fastMerkleRoot(hashes, hash256);
if (transactions.length === 1) return txhash0; console.log(forWitness);
// have other txs return forWitness ? hash256(Buffer.concat([rootHash, transactions[0].ins[0].witness[0]])) : rootHash;
let hashes = [ reverseBuffer(txhash0).toString('hex') ];
transactions.slice(1).forEach(function (value) {
hashes.push(value.hash);
});
return reverseBuffer(new Buffer(Object.values(merklebitcoin(hashes))[2].root, 'hex'));
} }
let last_epoch_number; let last_epoch_number;
@@ -161,7 +159,7 @@ function update_merkle_root_hash(blob_in, blob_out) {
module.exports.convertRavenBlob = function(blobBuffer) { module.exports.convertRavenBlob = function(blobBuffer) {
let header = blobBuffer.slice(0, 80); let header = blobBuffer.slice(0, 80);
update_merkle_root_hash(blobBuffer, header); update_merkle_root_hash(blobBuffer, header);
return reverseBuffer(hash256(hash256(header))); return reverseBuffer(hash256(header));
}; };
module.exports.constructNewRavenBlob = function(blockTemplate, nonceBuff, mixhashBuff) { module.exports.constructNewRavenBlob = function(blockTemplate, nonceBuff, mixhashBuff) {

5
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "cryptoforknote-util", "name": "cryptoforknote-util",
"version": "9.0.16", "version": "9.0.17",
"main": "cryptoforknote-util", "main": "cryptoforknote-util",
"author": { "author": {
"name": "LucasJones", "name": "LucasJones",
@@ -17,8 +17,7 @@
"bignum": "^0.13.1", "bignum": "^0.13.1",
"sha3": "*", "sha3": "*",
"varuint-bitcoin": "^1.0.4", "varuint-bitcoin": "^1.0.4",
"bitcoinjs-lib": "git+https://github.com/bitcoinjs/bitcoinjs-lib.git#533d6c2e6d0aa4111f7948b1c12003cf6ef83137", "bitcoinjs-lib": "git+https://github.com/bitcoinjs/bitcoinjs-lib.git#533d6c2e6d0aa4111f7948b1c12003cf6ef83137"
"merkle-bitcoin": "git+https://github.com/CloudMining/merkle-bitcoin.git#ec00ae20ba60d444e150ead03c747695ddaa83a1"
}, },
"keywords": [ "keywords": [
"cryptonight", "cryptonight",