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

monerov support

Browse Source
This commit is contained in:
xmvdev
2019-12-23 06:18:07 +00:00
parent 02d48ecc72
commit af767856f0
6 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/crypto/hash.h
View File

@@ -16,6 +16,10 @@ namespace crypto {
}
#pragma pack(push, 1)
POD_CLASS cycle {
public:
uint32_t data[32];
};
POD_CLASS hash {
char data[HASH_SIZE];
};

17
src/cryptonote_config.h
View File

@@ -3,12 +3,13 @@
#define CURRENT_TRANSACTION_VERSION 1
enum BLOB_TYPE {
BLOB_TYPE_CRYPTONOTE = 0,
BLOB_TYPE_FORKNOTE1 = 1,
BLOB_TYPE_FORKNOTE2 = 2,
BLOB_TYPE_CRYPTONOTE2 = 3, // Masari
BLOB_TYPE_CRYPTONOTE_RYO = 4, // Ryo
BLOB_TYPE_CRYPTONOTE_LOKI = 5, // Loki
BLOB_TYPE_CRYPTONOTE3 = 6, // Masari
BLOB_TYPE_AEON = 7, // Aeon
BLOB_TYPE_CRYPTONOTE = 0,
BLOB_TYPE_FORKNOTE1 = 1,
BLOB_TYPE_FORKNOTE2 = 2,
BLOB_TYPE_CRYPTONOTE2 = 3, // Masari
BLOB_TYPE_CRYPTONOTE_RYO = 4, // Ryo
BLOB_TYPE_CRYPTONOTE_LOKI = 5, // Loki
BLOB_TYPE_CRYPTONOTE3 = 6, // Masari
BLOB_TYPE_AEON = 7, // Aeon
BLOB_TYPE_CRYPTONOTE_CUCKOO = 8, // MoneroV / Swap
};

4
src/cryptonote_core/cryptonote_basic.h
View File

@@ -430,12 +430,15 @@ namespace cryptonote
uint64_t timestamp;
crypto::hash prev_id;
uint64_t nonce;
uint64_t nonce8;
crypto::cycle cycle;
BEGIN_SERIALIZE()
VARINT_FIELD(major_version)
VARINT_FIELD(minor_version)
if (blob_type != BLOB_TYPE_FORKNOTE2) VARINT_FIELD(timestamp)
FIELD(prev_id)
if (blob_type == BLOB_TYPE_CRYPTONOTE_CUCKOO) FIELD(nonce8)
if (blob_type != BLOB_TYPE_FORKNOTE2) {
if (blob_type == BLOB_TYPE_AEON) {
FIELD(nonce)
@@ -446,6 +449,7 @@ namespace cryptonote
if (!typename Archive<W>::is_saving()) nonce = nonce32;
}
}
if (blob_type == BLOB_TYPE_CRYPTONOTE_CUCKOO) FIELD(cycle)
END_SERIALIZE()
};

13
src/cryptonote_core/cryptonote_format_utils.cpp
View File

@@ -429,13 +429,24 @@ namespace cryptonote
//---------------------------------------------------------------
bool get_block_hashing_blob(const block& b, blobdata& blob)
{
blob = t_serializable_object_to_blob(static_cast<const block_header&>(b));
if (b.blob_type == BLOB_TYPE_CRYPTONOTE_CUCKOO) {
blob = t_serializable_object_to_blob(b.major_version);
blob.append(reinterpret_cast<const char*>(&b.minor_version), sizeof(b.minor_version));
blob.append(reinterpret_cast<const char*>(&b.timestamp), sizeof(b.timestamp));
blob.append(reinterpret_cast<const char*>(&b.prev_id), sizeof(b.prev_id));
}
else {
blob = t_serializable_object_to_blob(static_cast<const block_header&>(b));
}
crypto::hash tree_root_hash = get_tx_tree_hash(b);
blob.append(reinterpret_cast<const char*>(&tree_root_hash), sizeof(tree_root_hash));
blob.append(tools::get_varint_data(b.tx_hashes.size()+1));
if (b.blob_type == BLOB_TYPE_CRYPTONOTE3) {
blob.append(reinterpret_cast<const char*>(&b.uncle), sizeof(b.uncle));
}
if (b.blob_type == BLOB_TYPE_CRYPTONOTE_CUCKOO) {
blob.append(reinterpret_cast<const char*>(&b.nonce8), sizeof(b.nonce8));
}
return true;
}
//---------------------------------------------------------------

6
src/main.cc
View File

@@ -216,6 +216,12 @@ NAN_METHOD(construct_block_blob) { // (parentBlockTemplateBuffer, nonceBuffer, c
if (!mergeBlocks(parent_block, b, std::vector<crypto::hash>())) return THROW_ERROR_EXCEPTION("Failed to postprocess mining block");
}
if (blob_type == BLOB_TYPE_CRYPTONOTE_CUCKOO) {
if (info.Length() != 4) return THROW_ERROR_EXCEPTION("You must provide 4 arguments.");
Local<Array> cycle = Local<Array>::Cast(info[3]);
for (int i = 0; i < 32; i++ ) b.cycle.data[i] = cycle->Get(i)->NumberValue();
}
if (!block_to_blob(b, output)) return THROW_ERROR_EXCEPTION("Failed to convert block to blob");
v8::Local<v8::Value> returnValue = Nan::CopyBuffer((char*)output.data(), output.size()).ToLocalChecked();

2
src/serialization/crypto.h
View File

@@ -53,12 +53,14 @@ bool do_serialize(Archive<true> &ar, std::vector<crypto::signature> &v)
BLOB_SERIALIZER(crypto::chacha8_iv);
BLOB_SERIALIZER(crypto::hash);
BLOB_SERIALIZER(crypto::cycle);
BLOB_SERIALIZER(crypto::hash8);
BLOB_SERIALIZER(crypto::public_key);
BLOB_SERIALIZER(crypto::secret_key);
BLOB_SERIALIZER(crypto::key_derivation);
BLOB_SERIALIZER(crypto::key_image);
BLOB_SERIALIZER(crypto::signature);
VARIANT_TAG(debug_archive, crypto::cycle, "cycle");
VARIANT_TAG(debug_archive, crypto::hash, "hash");
VARIANT_TAG(debug_archive, crypto::hash8, "hash8");
VARIANT_TAG(debug_archive, crypto::public_key, "public_key");