Compare commits

...

4 Commits

Author SHA1 Message Date
MoneroOcean 4ccd4fdca7 KCN fix 2024-06-01 08:56:41 +03:00
MoneroOcean 71bda2c8bb KCN fix 2024-05-31 23:29:51 +03:00
MoneroOcean 261c518133 KCN fix 2024-05-31 20:19:14 +03:00
MoneroOcean 2a1741ac52 KCN fix 2024-05-31 20:16:33 +03:00
3 changed files with 72 additions and 15 deletions
+55 -1
View File
@@ -46,14 +46,40 @@ function hash256(buffer) {
return sha256(sha256(buffer));
};
function sha256_3(buffer) {
return crypto.createHash('sha3-256').update(buffer).digest();
};
function hash256_3(buffer) {
return sha256_3(sha256_3(buffer));
};
function transaction_hash(transaction, forWitness) {
if (forWitness && transaction.isCoinbase()) return Buffer.alloc(32, 0);
return hash256(transaction.__toBuffer(undefined, undefined, forWitness));
}
function transaction_hash3(transaction, forWitness) {
if (forWitness && transaction.isCoinbase()) return Buffer.alloc(32, 0);
return hash256_3(transaction.__toBuffer(undefined, undefined, forWitness));
}
function getMerkleRoot(transactions) {
if (transactions.length === 0) return Buffer.from('0000000000000000000000000000000000000000000000000000000000000000', 'hex')
const forWitness = txesHaveWitnessCommit(transactions);
const hashes = transactions.map(transaction => transaction.getHash(forWitness));
const hashes = transactions.map(transaction => transaction_hash(transaction, forWitness));
const rootHash = fastMerkleRoot(hashes, hash256);
return forWitness ? hash256(Buffer.concat([rootHash, transactions[0].ins[0].witness[0]])) : rootHash;
}
function getMerkleRoot3(transactions) {
if (transactions.length === 0) return Buffer.from('0000000000000000000000000000000000000000000000000000000000000000', 'hex')
const forWitness = txesHaveWitnessCommit(transactions);
const hashes = transactions.map(transaction => transaction_hash3(transaction, forWitness));
const rootHash = fastMerkleRoot(hashes, hash256_3);
return forWitness ? hash256_3(Buffer.concat([rootHash, transactions[0].ins[0].witness[0]])) : rootHash;
}
let last_epoch_number;
let last_seed_hash;
@@ -169,10 +195,26 @@ function update_merkle_root_hash(offset, payload, blob_in, blob_out) {
getMerkleRoot(transactions).copy(blob_out, 4 + 32);
};
function update_merkle_root_hash3(offset, payload, blob_in, blob_out) {
const nTransactions = varuint.decode(blob_in, offset);
offset += varuint.decode.bytes;
let transactions = [];
for (let i = 0; i < nTransactions; ++i) {
const tx = bitcoin.Transaction.fromBuffer(blob_in.slice(offset), true, payload && i == 0);
transactions.push(tx);
offset += tx.byteLength();
}
getMerkleRoot3(transactions).copy(blob_out, 4 + 32);
};
module.exports.blockHashBuff = function(blobBuffer) {
return reverseBuffer(hash256(blobBuffer));
};
module.exports.blockHashBuff3 = function(blobBuffer) {
return reverseBuffer(hash256_3(blobBuffer));
};
module.exports.convertRavenBlob = function(blobBuffer) {
let header = blobBuffer.slice(0, 80);
update_merkle_root_hash(80 + 8 + 32, false, blobBuffer, header);
@@ -221,8 +263,20 @@ module.exports.convertRtmBlob = function(blobBuffer) {
return header;
};
module.exports.convertKcnBlob = function(blobBuffer) {
let header = blobBuffer.slice(0, 80);
update_merkle_root_hash3(80, false, blobBuffer, header);
return header;
};
module.exports.constructNewRtmBlob = function(blockTemplate, nonceBuff) {
update_merkle_root_hash(80, true, blockTemplate, blockTemplate);
nonceBuff.copy(blockTemplate, 76, 0, 4);
return blockTemplate;
};
module.exports.constructNewKcnBlob = function(blockTemplate, nonceBuff) {
update_merkle_root_hash(80, false, blockTemplate, blockTemplate);
nonceBuff.copy(blockTemplate, 76, 0, 4);
return blockTemplate;
};
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "cryptoforknote-util",
"version": "15.3.5",
"version": "15.3.9",
"author": {
"name": "LucasJones",
"email": "lucasjonesdev@hotmail.co.uk"
+16 -13
View File
@@ -162,7 +162,7 @@ function addressToScript(addr) {
return Buffer.concat([Buffer.from([0x76, 0xa9, 0x14]), pubkey, Buffer.from([0x88, 0xac])]);
}
function createOutputTransaction(amount, payee, rewardToPool, reward, txOutputBuffers, payeeScript) {
function createTransactionOutput(amount, payee, rewardToPool, reward, txOutputBuffers, payeeScript) {
const payeeReward = amount;
if (!payeeScript) payeeScript = addressToScript(payee);
txOutputBuffers.push(Buffer.concat([
@@ -173,25 +173,25 @@ function createOutputTransaction(amount, payee, rewardToPool, reward, txOutputBu
return { reward: reward - amount, rewardToPool: rewardToPool - amount };
}
function generateOutputTransactions(rpcData, poolAddress) {
function generateTransactionOutputs(rpcData, poolAddress, is_witness) {
let reward = rpcData.coinbasevalue;
let rewardToPool = reward;
let txOutputBuffers = [];
if (rpcData.coinbasedevreward) {
const rewards = createOutputTransaction(rpcData.coinbasedevreward.value, rpcData.coinbasedevreward.address, rewardToPool, reward, txOutputBuffers, Buffer.from(rpcData.coinbasedevreward.scriptpubkey, 'hex'));
const rewards = createTransactionOutput(rpcData.coinbasedevreward.value, rpcData.coinbasedevreward.address, rewardToPool, reward, txOutputBuffers, Buffer.from(rpcData.coinbasedevreward.scriptpubkey, 'hex'));
reward = rewards.reward;
rewardToPool = rewards.rewardToPool;
}
if (rpcData.smartnode) {
if (rpcData.smartnode.payee) {
const rewards = createOutputTransaction(rpcData.smartnode.amount, rpcData.smartnode.payee, rewardToPool, reward, txOutputBuffers);
const rewards = createTransactionOutput(rpcData.smartnode.amount, rpcData.smartnode.payee, rewardToPool, reward, txOutputBuffers);
reward = rewards.reward;
rewardToPool = rewards.rewardToPool;
} else if (Array.isArray(rpcData.smartnode)) {
for (let i in rpcData.smartnode) {
const rewards = createOutputTransaction(rpcData.smartnode[i].amount, rpcData.smartnode[i].payee, rewardToPool, reward, txOutputBuffers);
const rewards = createTransactionOutput(rpcData.smartnode[i].amount, rpcData.smartnode[i].payee, rewardToPool, reward, txOutputBuffers);
reward = rewards.reward;
rewardToPool = rewards.rewardToPool;
}
@@ -200,7 +200,7 @@ function generateOutputTransactions(rpcData, poolAddress) {
if (rpcData.superblock) {
for (let i in rpcData.superblock) {
const rewards = createOutputTransaction(rpcData.superblock[i].amount, rpcData.superblock[i].payee, rewardToPool, reward, txOutputBuffers);
const rewards = createTransactionOutput(rpcData.superblock[i].amount, rpcData.superblock[i].payee, rewardToPool, reward, txOutputBuffers);
reward = rewards.reward;
rewardToPool = rewards.rewardToPool;
}
@@ -208,23 +208,23 @@ function generateOutputTransactions(rpcData, poolAddress) {
if (rpcData.founder_payments_started && rpcData.founder) {
const founderReward = rpcData.founder.amount || 0;
const rewards = createOutputTransaction(founderReward, rpcData.founder.payee, rewardToPool, reward, txOutputBuffers);
const rewards = createTransactionOutput(founderReward, rpcData.founder.payee, rewardToPool, reward, txOutputBuffers);
reward = rewards.reward;
rewardToPool = rewards.rewardToPool;
}
createOutputTransaction(rewardToPool, null, rewardToPool, reward, txOutputBuffers, Buffer.from(addressToScript(poolAddress), "hex"));
createTransactionOutput(rewardToPool, null, rewardToPool, reward, txOutputBuffers, Buffer.from(addressToScript(poolAddress), "hex"));
if (rpcData.default_witness_commitment !== undefined) {
if (is_witness) {
const witness_commitment = Buffer.from(rpcData.default_witness_commitment, 'hex');
txOutputBuffers.unshift(Buffer.concat([
packInt64LE(0),
txOutputBuffers.push(Buffer.concat([
varIntBuffer(1),
varIntBuffer(witness_commitment.length),
witness_commitment
]));
}
return Buffer.concat([ varIntBuffer(txOutputBuffers.length), Buffer.concat(txOutputBuffers)]);
return Buffer.concat([ varIntBuffer(is_witness ? txOutputBuffers.length - 1 : txOutputBuffers.length), Buffer.concat(txOutputBuffers)]);
}
module.exports.RtmBlockTemplate = function(rpcData, poolAddress) {
@@ -240,9 +240,12 @@ module.exports.RtmBlockTemplate = function(rpcData, poolAddress) {
const scriptSigPart2 = serializeString('/nodeStratum/');
const is_witness = false; //rpcData.default_witness_commitment !== undefined;
const blob1 = Buffer.concat([
coinbaseVersion,
// transaction input
Buffer.from(is_witness ? "0001" : "", 'hex'),
varIntBuffer(1), // txInputsCount
uint256BufferFromHash(""), // txInPrevOutHash
packUInt32LE(Math.pow(2, 32) - 1), // txInPrevOutIndex
@@ -255,7 +258,7 @@ module.exports.RtmBlockTemplate = function(rpcData, poolAddress) {
packUInt32LE(0), // txInSequence
// end transaction input
// transaction output
generateOutputTransactions(rpcData, poolAddress),
generateTransactionOutputs(rpcData, poolAddress, is_witness),
// end transaction ouput
packUInt32LE(0) // txLockTime
]);