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

Moved blob_type to transactrion_prefix

Browse Source
This commit is contained in:
MoneroOcean
2018-08-18 09:04:44 +02:00
parent cee6e90241
commit c2ce9edbbe
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cryptonote_core/cryptonote_basic.h
View File

@@ -141,6 +141,7 @@ namespace cryptonote
{ {
public: public:
enum BLOB_TYPE blob_type;
// tx information // tx information
size_t version; 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 uint64_t unlock_time; //number of block (or time), used as a limitation like: spend this tx not early then block/time
@@ -160,13 +161,12 @@ namespace cryptonote
protected: protected:
transaction_prefix(){} transaction_prefix() : blob_type(BLOB_TYPE_CRYPTONOTE) {}
}; };
class transaction: public transaction_prefix class transaction: public transaction_prefix
{ {
public: public:
enum BLOB_TYPE blob_type;
std::vector<std::vector<crypto::signature> > signatures; //count signatures always the same as inputs count std::vector<std::vector<crypto::signature> > signatures; //count signatures always the same as inputs count
rct::rctSig rct_signatures; rct::rctSig rct_signatures;
@@ -235,7 +235,7 @@ namespace cryptonote
}; };
inline inline
transaction::transaction() : blob_type(BLOB_TYPE_CRYPTONOTE) transaction::transaction()
{ {
set_null(); set_null();
} }

2
src/cryptonote_core/cryptonote_format_utils.cpp
View File

@@ -19,7 +19,7 @@ namespace cryptonote
void get_transaction_prefix_hash(const transaction_prefix& tx, crypto::hash& h) void get_transaction_prefix_hash(const transaction_prefix& tx, crypto::hash& h)
{ {
std::ostringstream s; std::ostringstream s;
if (t.blob_type == BLOB_TYPE_CRYPTONOTE_RYO) s << "ryo-currency"; if (tx.blob_type == BLOB_TYPE_CRYPTONOTE_RYO) s << "ryo-currency";
binary_archive<true> a(s); binary_archive<true> a(s);
::serialization::serialize(a, const_cast<transaction_prefix&>(tx)); ::serialization::serialize(a, const_cast<transaction_prefix&>(tx));
crypto::cn_fast_hash(s.str().data(), s.str().size(), h); crypto::cn_fast_hash(s.str().data(), s.str().size(), h);