diff --git a/src/cryptonote_core/cryptonote_basic.h b/src/cryptonote_core/cryptonote_basic.h index 11ab40a..b5f8496 100644 --- a/src/cryptonote_core/cryptonote_basic.h +++ b/src/cryptonote_core/cryptonote_basic.h @@ -408,7 +408,9 @@ namespace cryptonote BEGIN_SERIALIZE_OBJECT() VARINT_FIELD_N("major_version", b.major_version); + puts("[1"); if(b.major_version > CURRENT_BYTECOIN_BLOCK_MAJOR_VERSION) return false; + puts("]1"); VARINT_FIELD_N("minor_version", b.minor_version); VARINT_FIELD(timestamp); FIELD_N("prev_id", b.prev_id); @@ -481,7 +483,9 @@ namespace cryptonote BEGIN_SERIALIZE() VARINT_FIELD(major_version) + puts("[2"); if(major_version > BLOCK_MAJOR_VERSION_3) return false; + puts("]2"); VARINT_FIELD(minor_version) if (BLOCK_MAJOR_VERSION_1 == major_version) { @@ -504,11 +508,13 @@ namespace cryptonote BEGIN_SERIALIZE_OBJECT() FIELDS(*static_cast(this)) + puts("[3"); if (BLOCK_MAJOR_VERSION_2 <= major_version) { auto sbb = make_serializable_bytecoin_block(*this, false, false); FIELD_N("parent_block", sbb); } + puts("]3"); FIELD(miner_tx) FIELD(tx_hashes) END_SERIALIZE() diff --git a/src/main.cc b/src/main.cc index c702609..4d75320 100644 --- a/src/main.cc +++ b/src/main.cc @@ -83,9 +83,7 @@ NAN_METHOD(convert_blob) { //convert block b = AUTO_VAL_INIT(b); - puts("[1"); if (!parse_and_validate_block_from_blob(input, b)) return THROW_ERROR_EXCEPTION("Failed to parse block"); - puts("]1"); if (b.major_version < BLOCK_MAJOR_VERSION_2) { if (!get_block_hashing_blob(b, output)) return THROW_ERROR_EXCEPTION("Failed to create mining block");