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

Possible fix 2

Browse Source
This commit is contained in:
MoneroOcean
2018-05-01 22:45:18 +02:00
parent d8bc881bc2
commit 8912cad28b
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/cryptonote_core/cryptonote_basic.h
View File

@@ -165,21 +165,21 @@ namespace cryptonote
class transaction: public transaction_prefix class transaction: public transaction_prefix
{ {
enum BLOB_TYPE m_blob_type;
public: public:
enum BLOB_TYPE blob_type;
std::vector<std::vector<crypto::signature> > signatures; //count signatures always the same as inputs count std::vector<std::vector<crypto::signature> > signatures; //count signatures always the same as inputs count
rct::rctSig rct_signatures; rct::rctSig rct_signatures;
transaction(enum BLOB_TYPE = BLOB_TYPE_CRYPTONOTE); transaction();
virtual ~transaction(); virtual ~transaction();
void set_null(); void set_null();
BEGIN_SERIALIZE_OBJECT() BEGIN_SERIALIZE_OBJECT()
FIELDS(*static_cast<transaction_prefix *>(this)) FIELDS(*static_cast<transaction_prefix *>(this))
if (version == 1 && m_blob_type != BLOB_TYPE_CRYPTONOTE2) if (version == 1 && blob_type != BLOB_TYPE_CRYPTONOTE2)
{ {
printf("%i\n", m_blob_type); printf("%i\n", blob_type);
puts("xxx1"); puts("xxx1");
ar.tag("signatures"); ar.tag("signatures");
ar.begin_array(); ar.begin_array();
@@ -238,10 +238,9 @@ namespace cryptonote
}; };
inline inline
transaction::transaction(enum BLOB_TYPE blob_type) transaction::transaction()
{ {
set_null(); set_null();
m_blob_type = blob_type;
} }
inline inline
@@ -279,7 +278,7 @@ namespace cryptonote
/* */ /* */
/************************************************************************/ /************************************************************************/
const uint8_t CURRENT_BYTECOIN_BLOCK_MAJOR_VERSION = 1; /*const uint8_t CURRENT_BYTECOIN_BLOCK_MAJOR_VERSION = 1;
struct bytecoin_block struct bytecoin_block
{ {
@@ -367,7 +366,7 @@ namespace cryptonote
}; };
// Implemented below // Implemented below
inline serializable_bytecoin_block make_serializable_bytecoin_block(const block& b, bool hashing_serialization, bool header_only); inline serializable_bytecoin_block make_serializable_bytecoin_block(const block& b, bool hashing_serialization, bool header_only);*/
struct block_header struct block_header
{ {
@@ -395,7 +394,7 @@ namespace cryptonote
transaction miner_tx; transaction miner_tx;
std::vector<crypto::hash> tx_hashes; std::vector<crypto::hash> tx_hashes;
block() : miner_tx(blob_type) {} void set_blob_type(enum BLOB_TYPE bt) { miner_tx.blob_type = blob_type = bt; }
BEGIN_SERIALIZE_OBJECT() BEGIN_SERIALIZE_OBJECT()
FIELDS(*static_cast<block_header *>(this)) FIELDS(*static_cast<block_header *>(this))

6
src/main.cc
View File

@@ -87,7 +87,7 @@ NAN_METHOD(convert_blob) {
//convert //convert
block b = AUTO_VAL_INIT(b); block b = AUTO_VAL_INIT(b);
b.blob_type = blob_type; b.set_blob_type(blob_type);
if (!parse_and_validate_block_from_blob(input, b)) return THROW_ERROR_EXCEPTION("Failed to parse block"); if (!parse_and_validate_block_from_blob(input, b)) return THROW_ERROR_EXCEPTION("Failed to parse block");
if (blob_type == BLOB_TYPE_FORKNOTE2) { if (blob_type == BLOB_TYPE_FORKNOTE2) {
@@ -118,7 +118,7 @@ NAN_METHOD(get_block_id) {
} }
block b = AUTO_VAL_INIT(b); block b = AUTO_VAL_INIT(b);
b.blob_type = blob_type; b.set_blob_type(blob_type);
if (!parse_and_validate_block_from_blob(input, b)) return THROW_ERROR_EXCEPTION("Failed to parse block"); if (!parse_and_validate_block_from_blob(input, b)) return THROW_ERROR_EXCEPTION("Failed to parse block");
crypto::hash block_id; crypto::hash block_id;
@@ -149,7 +149,7 @@ NAN_METHOD(construct_block_blob) {
} }
block b = AUTO_VAL_INIT(b); block b = AUTO_VAL_INIT(b);
b.blob_type = blob_type; b.set_blob_type(blob_type);
if (!parse_and_validate_block_from_blob(block_template_blob, b)) return THROW_ERROR_EXCEPTION("Failed to parse block"); if (!parse_and_validate_block_from_blob(block_template_blob, b)) return THROW_ERROR_EXCEPTION("Failed to parse block");
b.nonce = nonce; b.nonce = nonce;