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

XHV fix

Browse Source
This commit is contained in:
MoneroOcean
2023-01-09 15:52:03 +00:00
parent 516160568f
commit 1afe313308
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "cryptoforknote-util",
"version": "13.0.1",
"version": "13.0.2",
"main": "cryptoforknote-util",
"author": {
"name": "LucasJones",

13
src/cryptonote_core/cryptonote_basic.h
View File

@@ -258,7 +258,7 @@ namespace cryptonote
uint64_t amount_burnt;
uint64_t amount_minted;
std::vector<uint64_t> output_unlock_times;
size_t collateral_index; // index to the outputs vector that denotes the collateral output.
std::vector<uint32_t> collateral_indices;
//
// NOTE: Loki specific
@@ -313,10 +313,15 @@ namespace cryptonote
if (version >= POU_TRANSACTION_VERSION && vout_xhv.size() != output_unlock_times.size()) return false;
VARINT_FIELD(amount_burnt)
VARINT_FIELD(amount_minted)
if (version >= COLLATERAL_TRANSACTION_VERSION) {
VARINT_FIELD(collateral_index)
if (collateral_index >= vout.size())
if (version >= COLLATERAL_TRANSACTION_VERSION && amount_burnt) {
FIELD(collateral_indices)
if (collateral_indices.size() != 2) {
return false;
}
for (const auto vout_idx: collateral_indices) {
if (vout_idx >= vout.size())
return false;
}
}
}
END_SERIALIZE()