d0s3t3ch/wownero
1
0
Fork 0
mirror of https://git.wownero.com/wownero/wownero.git synced 2024-08-15 01:03:23 +00:00
Code Issues Projects Releases Wiki Activity

create "unlock" branch

Browse source
This commit is contained in:
XfedeX 2023-01-13 17:50:48 +01:00
parent 92cfcf132e
commit 18ed0d273d
7 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/cryptonote_basic/cryptonote_basic.h
View file

@ -470,7 +470,7 @@ namespace cryptonote
VARINT_FIELD(timestamp)
FIELD(prev_id)
FIELD(nonce)
if (major_version >= BLOCK_HEADER_MINER_SIG && major_version < REMOVED_BLOCK_HEADER_MINER_SIG)
if (major_version >= BLOCK_HEADER_MINER_SIG)
{
FIELD(signature)
FIELD(vote)

2
src/cryptonote_basic/cryptonote_boost_serialization.h
View file

@ -196,7 +196,7 @@ namespace boost
a & b.timestamp;
a & b.prev_id;
a & b.nonce;
if (b.major_version >= BLOCK_HEADER_MINER_SIG && b.major_version < REMOVED_BLOCK_HEADER_MINER_SIG)
if (b.major_version >= BLOCK_HEADER_MINER_SIG)
{
a & b.signature;
a & b.vote;

2
src/cryptonote_basic/miner.cpp
View file

@ -609,7 +609,7 @@ namespace cryptonote
b.nonce = nonce;
// Miner Block Header Signing
if (b.major_version >= BLOCK_HEADER_MINER_SIG && b.major_version < REMOVED_BLOCK_HEADER_MINER_SIG)
if (b.major_version >= BLOCK_HEADER_MINER_SIG)
{
// tx key derivation
crypto::key_derivation derivation;

1
src/cryptonote_config.h
View file

@ -47,7 +47,6 @@
#define CURRENT_BLOCK_MAJOR_VERSION 7
#define CURRENT_BLOCK_MINOR_VERSION 7
#define BLOCK_HEADER_MINER_SIG 18
#define REMOVED_BLOCK_HEADER_MINER_SIG 20
#define CRYPTONOTE_BLOCK_FUTURE_TIME_LIMIT_V2 300*2
#define CRYPTONOTE_BLOCK_FUTURE_TIME_LIMIT 60*60*2
#define CRYPTONOTE_DEFAULT_TX_SPENDABLE_AGE 4

2
src/cryptonote_core/blockchain.cpp
View file

@ -1392,7 +1392,7 @@ difficulty_type Blockchain::get_next_difficulty_for_alternative_chain(const std:
bool Blockchain::prevalidate_miner_transaction(const block& b, uint64_t height, uint8_t hf_version)
{
// Miner Block Header Signing
if (hf_version >= BLOCK_HEADER_MINER_SIG && hf_version < REMOVED_BLOCK_HEADER_MINER_SIG)
if (hf_version >= BLOCK_HEADER_MINER_SIG)
{
// sanity checks
if (b.miner_tx.vout.size() != 1)

2
src/rpc/core_rpc_server.cpp
View file

@ -2192,7 +2192,7 @@ namespace cryptonote
return false;
}
b.nonce = req.starting_nonce;
if (b.major_version >= BLOCK_HEADER_MINER_SIG && b.major_version < REMOVED_BLOCK_HEADER_MINER_SIG)
if (b.major_version >= BLOCK_HEADER_MINER_SIG)
{
b.signature = {};
b.vote = 0;

2
src/rpc/daemon_handler.cpp
View file

@ -895,7 +895,7 @@ namespace rpc
header.minor_version = b.minor_version;
header.timestamp = b.timestamp;
header.nonce = b.nonce;
if (b.major_version >= BLOCK_HEADER_MINER_SIG && b.major_version < REMOVED_BLOCK_HEADER_MINER_SIG)
if (b.major_version >= BLOCK_HEADER_MINER_SIG)
{
header.signature = b.signature;
header.vote = b.vote;