Compare commits

...

14 Commits

Author SHA1 Message Date
MoneroOcean 0bb1785826 Fixed KCN reward 2024-06-01 19:20:26 +03:00
MoneroOcean 1c48ad7e46 Adjusted KCN reward 2024-06-01 16:57:50 +03:00
MoneroOcean f0c26e6d5b Adjusted KCN reward 2024-06-01 16:57:24 +03:00
MoneroOcean 7a1d7271a1 RTM fix 2024-06-01 10:22:55 +03:00
MoneroOcean 30e051fa46 KCN fix 2024-06-01 09:35:38 +03:00
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
MoneroOcean 1f59698bda Adds kcn dev reward to bt 2024-05-31 19:39:05 +03:00
MoneroOcean 3238964d2a Adds kcn dev reward to bt 2024-05-31 19:29:34 +03:00
MoneroOcean 85260f0281 Adds kcn dev reward to bt 2024-05-31 19:29:21 +03:00
MoneroOcean 8c944e469c Adds kcn dev reward to bt 2024-05-31 18:17:08 +03:00
MoneroOcean dae35d962a Added KCN coin support 2024-05-28 00:24:26 +03:00
3 changed files with 100 additions and 23 deletions
+55 -1
View File
@@ -46,14 +46,40 @@ function hash256(buffer) {
return sha256(sha256(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) { function getMerkleRoot(transactions) {
if (transactions.length === 0) return Buffer.from('0000000000000000000000000000000000000000000000000000000000000000', 'hex') if (transactions.length === 0) return Buffer.from('0000000000000000000000000000000000000000000000000000000000000000', 'hex')
const forWitness = txesHaveWitnessCommit(transactions); 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); const rootHash = fastMerkleRoot(hashes, hash256);
return forWitness ? hash256(Buffer.concat([rootHash, transactions[0].ins[0].witness[0]])) : rootHash; 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_epoch_number;
let last_seed_hash; 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); 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) { module.exports.blockHashBuff = function(blobBuffer) {
return reverseBuffer(hash256(blobBuffer)); return reverseBuffer(hash256(blobBuffer));
}; };
module.exports.blockHashBuff3 = function(blobBuffer) {
return reverseBuffer(hash256_3(blobBuffer));
};
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(80 + 8 + 32, false, blobBuffer, header); update_merkle_root_hash(80 + 8 + 32, false, blobBuffer, header);
@@ -221,8 +263,20 @@ module.exports.convertRtmBlob = function(blobBuffer) {
return header; 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) { module.exports.constructNewRtmBlob = function(blockTemplate, nonceBuff) {
update_merkle_root_hash(80, true, blockTemplate, blockTemplate); update_merkle_root_hash(80, true, blockTemplate, blockTemplate);
nonceBuff.copy(blockTemplate, 76, 0, 4); nonceBuff.copy(blockTemplate, 76, 0, 4);
return blockTemplate; return blockTemplate;
}; };
module.exports.constructNewKcnBlob = function(blockTemplate, nonceBuff) {
update_merkle_root_hash(80, false, blockTemplate, blockTemplate);
nonceBuff.copy(blockTemplate, 76, 0, 4);
return blockTemplate;
};
+2 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "cryptoforknote-util", "name": "cryptoforknote-util",
"version": "15.2.2", "version": "15.3.13",
"author": { "author": {
"name": "LucasJones", "name": "LucasJones",
"email": "lucasjonesdev@hotmail.co.uk" "email": "lucasjonesdev@hotmail.co.uk"
@@ -16,6 +16,7 @@
"bignum": "^0.13.1", "bignum": "^0.13.1",
"sha3": "*", "sha3": "*",
"base58-native": "*", "base58-native": "*",
"bech32": "*",
"varuint-bitcoin": "^1.0.4", "varuint-bitcoin": "^1.0.4",
"merkle-lib": "^2.0.10", "merkle-lib": "^2.0.10",
"bitcoinjs-lib": "git+https://github.com/MoneroOcean/bitcoinjs-lib.git" "bitcoinjs-lib": "git+https://github.com/MoneroOcean/bitcoinjs-lib.git"
+43 -21
View File
@@ -1,5 +1,6 @@
const bignum = require('bignum'); const bignum = require('bignum');
const base58 = require('base58-native'); const base58 = require('base58-native');
const bech32 = require('bech32');
const bitcoin = require('bitcoinjs-lib'); const bitcoin = require('bitcoinjs-lib');
const diff1 = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF; const diff1 = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF;
@@ -148,14 +149,20 @@ function getTransactionBuffers(txs) {
} }
function addressToScript(addr) { function addressToScript(addr) {
const decoded = base58.decode(addr); let decoded;
if (decoded.length != 25) throw new Error('Invalid address length for ' + addr); try {
if (!decoded) throw new Error('Base58 decode failed for ' + addr); decoded = base58.decode(addr);
} catch(err) {}
if (!decoded || decoded.length != 25) {
const decoded2 = Buffer.from(bech32.bech32.fromWords(bech32.bech32.decode(addr).words.slice(1)));
if (decoded2.length != 20) throw new Error('Invalid address ' + addr);
return Buffer.concat([Buffer.from([0x0, 0x14]), decoded2]);
}
const pubkey = decoded.slice(1, -4); const pubkey = decoded.slice(1, -4);
return Buffer.concat([Buffer.from([0x76, 0xa9, 0x14]), pubkey, Buffer.from([0x88, 0xac])]); 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; const payeeReward = amount;
if (!payeeScript) payeeScript = addressToScript(payee); if (!payeeScript) payeeScript = addressToScript(payee);
txOutputBuffers.push(Buffer.concat([ txOutputBuffers.push(Buffer.concat([
@@ -166,19 +173,25 @@ function createOutputTransaction(amount, payee, rewardToPool, reward, txOutputBu
return { reward: reward - amount, rewardToPool: rewardToPool - amount }; return { reward: reward - amount, rewardToPool: rewardToPool - amount };
} }
function generateOutputTransactions(rpcData, poolAddress) { function generateTransactionOutputs(rpcData, poolAddress, is_witness) {
let reward = rpcData.coinbasevalue; let reward = rpcData.coinbasevalue + (rpcData.coinbasedevreward ? rpcData.coinbasedevreward.value : 0);
let rewardToPool = reward; let rewardToPool = reward;
let txOutputBuffers = []; let txOutputBuffers = [];
if (rpcData.coinbasedevreward) {
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) {
if (rpcData.smartnode.payee) { 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; reward = rewards.reward;
rewardToPool = rewards.rewardToPool; rewardToPool = rewards.rewardToPool;
} else if (Array.isArray(rpcData.smartnode)) { } else if (Array.isArray(rpcData.smartnode)) {
for (let i in 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; reward = rewards.reward;
rewardToPool = rewards.rewardToPool; rewardToPool = rewards.rewardToPool;
} }
@@ -187,7 +200,7 @@ function generateOutputTransactions(rpcData, poolAddress) {
if (rpcData.superblock) { if (rpcData.superblock) {
for (let i in 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; reward = rewards.reward;
rewardToPool = rewards.rewardToPool; rewardToPool = rewards.rewardToPool;
} }
@@ -195,41 +208,44 @@ function generateOutputTransactions(rpcData, poolAddress) {
if (rpcData.founder_payments_started && rpcData.founder) { if (rpcData.founder_payments_started && rpcData.founder) {
const founderReward = rpcData.founder.amount || 0; 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; reward = rewards.reward;
rewardToPool = rewards.rewardToPool; 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'); const witness_commitment = Buffer.from(rpcData.default_witness_commitment, 'hex');
txOutputBuffers.unshift(Buffer.concat([ txOutputBuffers.push(Buffer.concat([
packInt64LE(0), varIntBuffer(1),
varIntBuffer(witness_commitment.length), varIntBuffer(witness_commitment.length),
witness_commitment 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) { module.exports.RtmBlockTemplate = function(rpcData, poolAddress) {
const extraNoncePlaceholderLength = 17; const extraNoncePlaceholderLength = 17;
const coinbaseVersion = Buffer.concat([packUInt16LE(3), packUInt16LE(5)]); const coinbaseVersion = rpcData.coinbasedevreward ? Buffer.concat([packUInt16LE(1), packUInt16LE(0)]) : Buffer.concat([packUInt16LE(3), packUInt16LE(5)]);
const scriptSigPart1 = Buffer.concat([ const scriptSigPart1 = Buffer.concat([
serializeNumber(rpcData.height), serializeNumber(rpcData.height),
Buffer.from(rpcData.coinbaseaux.flags, 'hex'), Buffer.from(rpcData.coinbaseaux.flags ? rpcData.coinbaseaux.flags : "", 'hex'),
serializeNumber(Date.now() / 1000 | 0), serializeNumber(Date.now() / 1000 | 0),
Buffer.from([extraNoncePlaceholderLength]) Buffer.from([extraNoncePlaceholderLength])
]); ]);
const scriptSigPart2 = serializeString('/nodeStratum/'); const scriptSigPart2 = serializeString('/nodeStratum/');
const is_witness = false; //rpcData.default_witness_commitment !== undefined;
const blob1 = Buffer.concat([ const blob1 = Buffer.concat([
coinbaseVersion, coinbaseVersion,
// transaction input // transaction input
Buffer.from(is_witness ? "0001" : "", 'hex'),
varIntBuffer(1), // txInputsCount varIntBuffer(1), // txInputsCount
uint256BufferFromHash(""), // txInPrevOutHash uint256BufferFromHash(""), // txInPrevOutHash
packUInt32LE(Math.pow(2, 32) - 1), // txInPrevOutIndex packUInt32LE(Math.pow(2, 32) - 1), // txInPrevOutIndex
@@ -242,13 +258,19 @@ module.exports.RtmBlockTemplate = function(rpcData, poolAddress) {
packUInt32LE(0), // txInSequence packUInt32LE(0), // txInSequence
// end transaction input // end transaction input
// transaction output // transaction output
generateOutputTransactions(rpcData, poolAddress), generateTransactionOutputs(rpcData, poolAddress, is_witness),
// end transaction ouput // end transaction ouput
packUInt32LE(0), // txLockTime packUInt32LE(0) // txLockTime
varIntBuffer(rpcData.coinbase_payload.length / 2),
Buffer.from(rpcData.coinbase_payload, 'hex')
]); ]);
if (rpcData.coinbase_payload) {
blob2 = Buffer.concat([
blob2,
varIntBuffer(rpcData.coinbase_payload.length / 2),
Buffer.from(rpcData.coinbase_payload, 'hex')
]);
}
const prev_hash = reverseBuffer(Buffer.from(rpcData.previousblockhash, 'hex')).toString('hex'); const prev_hash = reverseBuffer(Buffer.from(rpcData.previousblockhash, 'hex')).toString('hex');
const version = packInt32LE(rpcData.version).toString('hex'); const version = packInt32LE(rpcData.version).toString('hex');
const curtime = packUInt32LE(rpcData.curtime).toString('hex'); const curtime = packUInt32LE(rpcData.curtime).toString('hex');