Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| dae35d962a | |||
| 89fc132363 | |||
| af3cc3e902 | |||
| 4d8a30042e | |||
| a760b46501 | |||
| 9ef2d782c1 |
+1
-1
@@ -31,7 +31,7 @@
|
|||||||
"-fno-exceptions -std=gnu11 -march=native -fPIC -DNDEBUG -Ofast -funroll-loops -fvariable-expansion-in-unroller -ftree-loop-if-convert-stores -fmerge-all-constants -fbranch-target-load-optimize2"
|
"-fno-exceptions -std=gnu11 -march=native -fPIC -DNDEBUG -Ofast -funroll-loops -fvariable-expansion-in-unroller -ftree-loop-if-convert-stores -fmerge-all-constants -fbranch-target-load-optimize2"
|
||||||
],
|
],
|
||||||
"cflags_cc": [
|
"cflags_cc": [
|
||||||
"-fexceptions -frtti -std=c++14 -march=native -fPIC -DNDEBUG -Ofast -s -funroll-loops -fvariable-expansion-in-unroller -ftree-loop-if-convert-stores -fmerge-all-constants -fbranch-target-load-optimize2"
|
"-fexceptions -frtti -std=c++17 -march=native -fPIC -DNDEBUG -Ofast -s -funroll-loops -fvariable-expansion-in-unroller -ftree-loop-if-convert-stores -fmerge-all-constants -fbranch-target-load-optimize2"
|
||||||
],
|
],
|
||||||
"xcode_settings": {
|
"xcode_settings": {
|
||||||
"OTHER_CFLAGS": [ "-fexceptions -frtti" ]
|
"OTHER_CFLAGS": [ "-fexceptions -frtti" ]
|
||||||
|
|||||||
+2
-2
@@ -1,7 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "cryptoforknote-util",
|
"name": "cryptoforknote-util",
|
||||||
"version": "15.2.0",
|
"version": "15.3.2",
|
||||||
"main": "cryptoforknote-util",
|
|
||||||
"author": {
|
"author": {
|
||||||
"name": "LucasJones",
|
"name": "LucasJones",
|
||||||
"email": "lucasjonesdev@hotmail.co.uk"
|
"email": "lucasjonesdev@hotmail.co.uk"
|
||||||
@@ -17,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"
|
||||||
|
|||||||
@@ -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;
|
||||||
@@ -149,8 +150,11 @@ function getTransactionBuffers(txs) {
|
|||||||
|
|
||||||
function addressToScript(addr) {
|
function addressToScript(addr) {
|
||||||
const decoded = base58.decode(addr);
|
const decoded = base58.decode(addr);
|
||||||
if (decoded.length != 25) throw new Error('Invalid address length for ' + addr);
|
if (!decoded || decoded.length != 25) {
|
||||||
if (!decoded) throw new Error('Base58 decode failed for ' + addr);
|
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])]);
|
||||||
}
|
}
|
||||||
@@ -220,7 +224,7 @@ module.exports.RtmBlockTemplate = function(rpcData, poolAddress) {
|
|||||||
|
|
||||||
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])
|
||||||
]);
|
]);
|
||||||
@@ -244,11 +248,17 @@ module.exports.RtmBlockTemplate = function(rpcData, poolAddress) {
|
|||||||
// transaction output
|
// transaction output
|
||||||
generateOutputTransactions(rpcData, poolAddress),
|
generateOutputTransactions(rpcData, poolAddress),
|
||||||
// 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');
|
||||||
|
|||||||
@@ -26,6 +26,7 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include <cstdint>
|
||||||
#include <set>
|
#include <set>
|
||||||
#include <list>
|
#include <list>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ template <>
|
|||||||
struct binary_archive<false> : public binary_archive_base<std::istream, false>
|
struct binary_archive<false> : public binary_archive_base<std::istream, false>
|
||||||
{
|
{
|
||||||
explicit binary_archive(stream_type &s) : base_type(s) {
|
explicit binary_archive(stream_type &s) : base_type(s) {
|
||||||
stream_type::streampos pos = stream_.tellg();
|
auto pos = stream_.tellg();
|
||||||
stream_.seekg(0, std::ios_base::end);
|
stream_.seekg(0, std::ios_base::end);
|
||||||
eof_pos_ = stream_.tellg();
|
eof_pos_ = stream_.tellg();
|
||||||
stream_.seekg(pos);
|
stream_.seekg(pos);
|
||||||
|
|||||||
Reference in New Issue
Block a user