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

Bug fix

Browse Source
This commit is contained in:
MoneroOcean
2020-07-15 12:16:30 -07:00
parent 4524ed1e16
commit 261917b1ad
2 changed files with 54 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/cryptonote_core/cryptonote_format_utils.cpp
View File

@@ -87,8 +87,13 @@ namespace cryptonote
uint64_t amount_out = 0; uint64_t amount_out = 0;
BOOST_FOREACH(auto& in, tx.vin) BOOST_FOREACH(auto& in, tx.vin)
{ {
CHECK_AND_ASSERT_MES(in.type() == typeid(txin_to_key), 0, "unexpected type id in transaction"); if (blob_type != BLOB_TYPE_CRYPTONOTE_XHV) {
amount_in += boost::get<txin_to_key>(in).amount; CHECK_AND_ASSERT_MES(in.type() == typeid(txin_to_key), 0, "unexpected type id in transaction");
amount_in += boost::get<txin_to_key>(in).amount;
} else {
CHECK_AND_ASSERT_MES(in.type() == typeid(txin_to_key) || in.type() == typeid(txin_offshore) || in.type() == typeid(txin_onshore), 0, "unexpected type id in transaction");
amount_in += in.type() == typeid(txin_to_key) ? boost::get<txin_to_key>(in).amount : in.type() == typeid(txin_onshore) ? boost::get<txin_onshore>(in).amount : boost::get<txin_offshore>(in).amount;
}
} }
BOOST_FOREACH(auto& o, tx.vout) BOOST_FOREACH(auto& o, tx.vout)
amount_out += o.amount; amount_out += o.amount;
@@ -235,10 +240,15 @@ namespace cryptonote
{ {
BOOST_FOREACH(const auto& in, tx.vin) BOOST_FOREACH(const auto& in, tx.vin)
{ {
CHECK_AND_ASSERT_MES(in.type() == typeid(txin_to_key), false, "wrong variant type: " if (blob_type != BLOB_TYPE_CRYPTONOTE_XHV) {
<< in.type().name() << ", expected " << typeid(txin_to_key).name() CHECK_AND_ASSERT_MES(in.type() == typeid(txin_to_key), false, "wrong variant type: "
<< ", in transaction id=" << get_transaction_hash(tx)); << in.type().name() << ", expected " << typeid(txin_to_key).name()
<< ", in transaction id=" << get_transaction_hash(tx));
} else {
CHECK_AND_ASSERT_MES(in.type() == typeid(txin_to_key) || in.type() == typeid(txin_offshore) || in.type() == typeid(txin_onshore), false, "wrong variant type: "
<< in.type().name() << ", expected " << typeid(txin_to_key).name() << "or " << typeid(txin_onshore).name()
<< ", in transaction id=" << get_transaction_hash(tx));
}
} }
return true; return true;
} }
@@ -247,14 +257,29 @@ namespace cryptonote
{ {
BOOST_FOREACH(const tx_out& out, tx.vout) BOOST_FOREACH(const tx_out& out, tx.vout)
{ {
CHECK_AND_ASSERT_MES(out.target.type() == typeid(txout_to_key), false, "wrong variant type: " if (blob_type != BLOB_TYPE_CRYPTONOTE_XHV) {
<< out.target.type().name() << ", expected " << typeid(txout_to_key).name() CHECK_AND_ASSERT_MES(out.target.type() == typeid(txout_to_key), false, "wrong variant type: "
<< ", in transaction id=" << get_transaction_hash(tx)); << out.target.type().name() << ", expected " << typeid(txout_to_key).name()
<< ", in transaction id=" << get_transaction_hash(tx));
} else {
CHECK_AND_ASSERT_MES(out.target.type() == typeid(txout_to_key) || out.target.type() == typeid(txout_offshore), false, "wrong variant type: "
<< out.target.type().name() << ", expected " << typeid(txout_to_key).name()
<< "or " << typeid(txout_offshore).name()
<< ", in transaction id=" << get_transaction_hash(tx));
}
CHECK_AND_NO_ASSERT_MES(0 < out.amount, false, "zero amount ouput in transaction id=" << get_transaction_hash(tx)); if (tx.version == 1)
{
CHECK_AND_NO_ASSERT_MES(0 < out.amount, false, "zero amount ouput in transaction id=" << get_transaction_hash(tx));
}
if(!check_key(boost::get<txout_to_key>(out.target).key)) if (blob_type != BLOB_TYPE_CRYPTONOTE_XHV) {
return false; if(!check_key(boost::get<txout_to_key>(out.target).key))
return false;
} else {
if(!check_key(out.target.type() == typeid(txout_to_key) ? boost::get<txout_to_key>(out.target).key : boost::get<txout_offshore>(out.target).key))
return false;
}
} }
return true; return true;
} }
@@ -269,7 +294,13 @@ namespace cryptonote
uint64_t money = 0; uint64_t money = 0;
BOOST_FOREACH(const auto& in, tx.vin) BOOST_FOREACH(const auto& in, tx.vin)
{ {
CHECKED_GET_SPECIFIC_VARIANT(in, const txin_to_key, tokey_in, false); if (blob_type == BLOB_TYPE_CRYPTONOTE_XHV && tx.vin[0].type() == typeid(txin_offshore)) {
CHECKED_GET_SPECIFIC_VARIANT(in, const txin_offshore, tokey_in, false);
} else if (blob_type == BLOB_TYPE_CRYPTONOTE_XHV && tx.vin[0].type() == typeid(txin_onshore)) {
CHECKED_GET_SPECIFIC_VARIANT(in, const txin_onshore, tokey_in, false);
} else {
CHECKED_GET_SPECIFIC_VARIANT(in, const txin_to_key, tokey_in, false);
}
if(money > tokey_in.amount + money) if(money > tokey_in.amount + money)
return false; return false;
money += tokey_in.amount; money += tokey_in.amount;
@@ -406,7 +437,16 @@ namespace cryptonote
binary_archive<true> ba(ss); binary_archive<true> ba(ss);
const size_t inputs = t.vin.size(); const size_t inputs = t.vin.size();
const size_t outputs = t.vout.size(); const size_t outputs = t.vout.size();
const size_t mixin = t.vin.empty() ? 0 : t.vin[0].type() == typeid(txin_to_key) ? boost::get<txin_to_key>(t.vin[0]).key_offsets.size() - 1 : 0; size_t mixin;
if (blob_type != BLOB_TYPE_CRYPTONOTE_XHV) {
mixin = t.vin.empty() ? 0 : t.vin[0].type() == typeid(txin_to_key) ? boost::get<txin_to_key>(t.vin[0]).key_offsets.size() - 1 : 0;
} else {
mixin = t.vin.empty() ? 0 :
t.vin[0].type() == typeid(txin_to_key) ? boost::get<txin_to_key>(t.vin[0]).key_offsets.size() - 1 :
t.vin[0].type() == typeid(txin_offshore) ? boost::get<txin_offshore>(t.vin[0]).key_offsets.size() - 1 :
t.vin[0].type() == typeid(txin_onshore) ? boost::get<txin_onshore>(t.vin[0]).key_offsets.size() - 1 :
0;
}
bool r = tt.rct_signatures.p.serialize_rctsig_prunable(ba, t.rct_signatures.type, inputs, outputs, mixin); bool r = tt.rct_signatures.p.serialize_rctsig_prunable(ba, t.rct_signatures.type, inputs, outputs, mixin);
CHECK_AND_ASSERT_MES(r, false, "Failed to serialize rct signatures prunable"); CHECK_AND_ASSERT_MES(r, false, "Failed to serialize rct signatures prunable");
cryptonote::get_blob_hash(ss.str(), hashes[2]); cryptonote::get_blob_hash(ss.str(), hashes[2]);
@@ -491,15 +531,6 @@ namespace cryptonote
return get_object_hash(blob, res); return get_object_hash(blob, res);
} }
//--------------------------------------------------------------- //---------------------------------------------------------------
bool get_block_longhash(const block& b, crypto::hash& res, uint64_t height)
{
blobdata bd;
if(!get_block_hashing_blob(b, bd))
return false;
crypto::cn_slow_hash(bd.data(), bd.size(), res);
return true;
}
//---------------------------------------------------------------
std::vector<uint64_t> relative_output_offsets_to_absolute(const std::vector<uint64_t>& off) std::vector<uint64_t> relative_output_offsets_to_absolute(const std::vector<uint64_t>& off)
{ {
std::vector<uint64_t> res = off; std::vector<uint64_t> res = off;
@@ -520,13 +551,6 @@ namespace cryptonote
return res; return res;
} }
//--------------------------------------------------------------- //---------------------------------------------------------------
crypto::hash get_block_longhash(const block& b, uint64_t height)
{
crypto::hash p = null_hash;
get_block_longhash(b, p, height);
return p;
}
//---------------------------------------------------------------
bool get_bytecoin_block_longhash(const block& b, crypto::hash& res) bool get_bytecoin_block_longhash(const block& b, crypto::hash& res)
{ {
blobdata bd; blobdata bd;

2
src/cryptonote_core/cryptonote_format_utils.h
View File

@@ -82,8 +82,6 @@ namespace cryptonote
bool get_block_hash(const block& b, crypto::hash& res); bool get_block_hash(const block& b, crypto::hash& res);
crypto::hash get_block_hash(const block& b); crypto::hash get_block_hash(const block& b);
bool get_block_header_hash(const block& b, crypto::hash& res); bool get_block_header_hash(const block& b, crypto::hash& res);
bool get_block_longhash(const block& b, crypto::hash& res, uint64_t height);
crypto::hash get_block_longhash(const block& b, uint64_t height);
bool get_bytecoin_block_longhash(const block& blk, crypto::hash& res); bool get_bytecoin_block_longhash(const block& blk, crypto::hash& res);
bool parse_and_validate_block_from_blob(const blobdata& b_blob, block& b); bool parse_and_validate_block_from_blob(const blobdata& b_blob, block& b);
bool get_inputs_money_amount(const transaction& tx, uint64_t& money); bool get_inputs_money_amount(const transaction& tx, uint64_t& money);