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

PR fixes

Browse Source
This commit is contained in:
MoneroOcean
2025-06-09 08:18:02 -07:00
parent d93aaec6a5
commit b9260e0c7b
3 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cryptonote_basic/txtypes.h → src/cryptonote_basic/arq_txtypes.h
+1 -1
View File
@@ -2,7 +2,7 @@
#include <cstdint>
namespace cryptonote
namespace cryptonote_arq
{
enum class txversion : uint16_t
{
src/cryptonote_basic/cryptonote_basic.h
+20 -18
View File
@@ -29,7 +29,7 @@
#include "offshore/pricing_record.h"
#include "zephyr_oracle/pricing_record.h"
#include "salvium_oracle/pricing_record.h"
#include "txtypes.h"
#include "arq_txtypes.h"
namespace cryptonote
@@ -62,7 +62,7 @@ namespace cryptonote
RETURN = 7,
MAX = 7
};
/* outputs */
struct txout_to_script
@@ -286,7 +286,7 @@ namespace cryptonote
uint64_t amount;
std::vector<uint64_t> key_offsets;
crypto::key_image k_image;
BEGIN_SERIALIZE_OBJECT()
VARINT_FIELD(amount)
FIELD(key_offsets)
@@ -338,7 +338,7 @@ namespace cryptonote
FIELD(k_image)
END_SERIALIZE()
};
struct txin_salvium_key
{
uint64_t amount;
@@ -353,7 +353,7 @@ namespace cryptonote
FIELD(k_image)
END_SERIALIZE()
};
typedef boost::variant<txin_gen, txin_to_script, txin_to_scripthash, txin_to_key, txin_offshore, txin_onshore, txin_xasset, txin_haven_key> txin_v;
typedef boost::variant<txin_gen, txin_to_script, txin_to_scripthash, txin_zephyr_key> txin_zephyr_v;
typedef boost::variant<txin_gen, txin_to_script, txin_to_scripthash, txin_salvium_key> txin_salvium_v;
@@ -427,7 +427,7 @@ namespace cryptonote
size_t version;
uint64_t unlock_time; //number of block (or time), used as a limitation like: spend this tx not early then block/time
txtype tx_type;
cryptonote_arq::txtype arq_tx_type;
std::vector<txin_v> vin;
std::vector<txin_zephyr_v> vin_zephyr;
@@ -449,7 +449,7 @@ namespace cryptonote
// SALVIUM-SPECIFIC FIELDS
// TX type
cryptonote::salvium_transaction_type tx_type;
cryptonote::salvium_transaction_type sal_tx_type;
crypto::public_key return_address;
// Return address list (must be at least 1 and at most BULLETPROOF_MAX_OUTPUTS-1 - the "-1" is for the change output)
std::vector<crypto::public_key> return_address_list;
@@ -488,10 +488,10 @@ namespace cryptonote
if (blob_type == BLOB_TYPE_CRYPTONOTE_XHV) {
VARINT_FIELD(version)
//if(version == 0 || CURRENT_TRANSACTION_VERSION < version) return false;
// Only transactions prior to HAVEN_TYPES_TRANSACTION_VERSION are permitted to be anything other than HAVEN_TYPES and need translation
if (version < HAVEN_TYPES_TRANSACTION_VERSION) {
if (version < POU_TRANSACTION_VERSION) {
VARINT_FIELD(unlock_time)
}
@@ -723,7 +723,7 @@ namespace cryptonote
}
return true;
}
FIELD(vin)
FIELD(vout_xhv)
FIELD(extra)
@@ -739,10 +739,10 @@ namespace cryptonote
FIELD(vin_salvium)
FIELD(vout_salvium)
FIELD(extra)
VARINT_FIELD(tx_type)
if (tx_type != cryptonote::salvium_transaction_type::PROTOCOL) {
VARINT_FIELD(sal_tx_type)
if (sal_tx_type != cryptonote::salvium_transaction_type::PROTOCOL) {
VARINT_FIELD(amount_burnt)
if (tx_type != cryptonote::salvium_transaction_type::MINER) {
if (sal_tx_type != cryptonote::salvium_transaction_type::MINER) {
if (type == cryptonote::salvium_transaction_type::TRANSFER && version >= TRANSACTION_VERSION_N_OUTS) {
FIELD(return_address_list)
FIELD(return_address_change_mask)
@@ -766,10 +766,10 @@ namespace cryptonote
FIELD(is_deregister)
}
if (version >= static_cast<size_t>(cryptonote::txversion::v3) && (blob_type == BLOB_TYPE_CRYPTONOTE_ARQMA))
if (version >= static_cast<size_t>(cryptonote_arq::txversion::v3) && (blob_type == BLOB_TYPE_CRYPTONOTE_ARQMA))
{
VARINT_FIELD(tx_type)
if (static_cast<uint16_t>(tx_type) >= static_cast<uint16_t>(cryptonote::txtype::_count))
VARINT_FIELD(arq_tx_type)
if (static_cast<uint16_t>(arq_tx_type) >= static_cast<uint16_t>(cryptonote_arq::txtype::_count))
return false;
FIELD(output_unlock_times)
}
@@ -788,7 +788,7 @@ namespace cryptonote
if (blob_type == BLOB_TYPE_CRYPTONOTE_LOKI || blob_type == BLOB_TYPE_CRYPTONOTE_XTNC || blob_type == BLOB_TYPE_CRYPTONOTE_ARQMA)
{
if ((version >= loki_version_3_per_output_unlock_times || version >= static_cast<size_t>(cryptonote::txversion::v3)) && vout.size() != output_unlock_times.size())
if ((version >= loki_version_3_per_output_unlock_times || version >= static_cast<size_t>(cryptonote_arq::txversion::v3)) && vout.size() != output_unlock_times.size())
return false;
}
FIELD(extra)
@@ -936,7 +936,7 @@ namespace cryptonote
output_unlock_times.clear();
collateral_indices.clear();
// SAL
tx_type = cryptonote::salvium_transaction_type::UNSET;
sal_tx_type = cryptonote::salvium_transaction_type::UNSET;
return_address = cryptonote::null_pkey;
return_address_list.clear();
return_address_change_mask.clear();
@@ -944,6 +944,8 @@ namespace cryptonote
source_asset_type.clear();
destination_asset_type.clear();
amount_slippage_limit = 0;
// ARQ
arq_tx_type = 0;
}
inline
src/main.cc
+5 -5
View File
@@ -33,7 +33,7 @@ blobdata uint64be_to_blob(uint64_t num) {
res[7] = num & 0xff;
return res;
}
static bool fillExtra(cryptonote::block& block1, const cryptonote::block& block2) {
cryptonote::tx_extra_merge_mining_tag mm_tag;
mm_tag.depth = 0;
@@ -251,7 +251,7 @@ NAN_METHOD(address_decode) {
Local<Object> target = info[0]->ToObject(isolate->GetCurrentContext()).ToLocalChecked();
if (!Buffer::HasInstance(target)) return THROW_ERROR_EXCEPTION("Argument should be a buffer object.");
blobdata input = std::string(Buffer::Data(target), Buffer::Length(target));
blobdata data;
@@ -332,8 +332,8 @@ NAN_METHOD(construct_mm_parent_block_blob) { // (parentBlockTemplate, blob_type,
if (!parse_and_validate_block_from_blob(input, b)) return THROW_ERROR_EXCEPTION("construct_mm_parent_block_blob: Failed to parse prent block");
if (blob_type == BLOB_TYPE_CRYPTONOTE_LOKI || blob_type == BLOB_TYPE_CRYPTONOTE_XTNC) b.miner_tx.version = cryptonote::loki_version_2;
if (blob_type == BLOB_TYPE_CRYPTONOTE_ARQMA) {
b.miner_tx.version = static_cast<size_t>(cryptonote::txversion::v3);
b.miner_tx.tx_type = cryptonote::txtype::standard;
b.miner_tx.arq_version = static_cast<size_t>(cryptonote_arq::txversion::v3);
b.miner_tx.arq_tx_type = cryptonote_arq::txtype::standard;
}
block b2 = AUTO_VAL_INIT(b2);
@@ -374,7 +374,7 @@ NAN_METHOD(construct_mm_child_block_blob) { // (shareBuffer, blob_type, childBlo
if (!parse_and_validate_block_from_blob(child_block_template_blob, b2)) return THROW_ERROR_EXCEPTION("construct_mm_child_block_blob: Failed to parse child block");
if (!mergeBlocks(b, b2, std::vector<crypto::hash>())) return THROW_ERROR_EXCEPTION("construct_mm_child_block_blob: Failed to postprocess mining block");
blobdata output = "";
if (!block_to_blob(b2, output)) return THROW_ERROR_EXCEPTION("construct_mm_child_block_blob: Failed to convert child block to blob");