Resolves #1083 (#1084)

turtlecoin · Jul 26, 2020 · a0bf8fd · a0bf8fd
1 parent 4cadd7c
commit a0bf8fd
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 3 deletions.
diff --git a/src/common/TransactionExtra.cpp b/src/common/TransactionExtra.cpp
@@ -204,6 +204,26 @@ namespace CryptoNote
     }
 
     bool addExtraNonceToTransactionExtra(std::vector<uint8_t> &tx_extra, const BinaryArray &extra_nonce)
+    {
+        if (extra_nonce.size() > TX_EXTRA_NONCE_MAX_COUNT)
+        {
+            return false;
+        }
+
+        size_t start_pos = tx_extra.size();
+        tx_extra.resize(tx_extra.size() + 2 + extra_nonce.size());
+        // write tag
+        tx_extra[start_pos] = TX_EXTRA_NONCE;
+        // write len
+        ++start_pos;
+        tx_extra[start_pos] = static_cast<uint8_t>(extra_nonce.size());
+        // write data
+        ++start_pos;
+        memcpy(&tx_extra[start_pos], extra_nonce.data(), extra_nonce.size());
+        return true;
+    }
+
+    bool addPoolNonceToTransactionExtra(std::vector<uint8_t> &tx_extra, const BinaryArray &extra_nonce)
     {
         size_t start_pos = tx_extra.size();
         tx_extra.resize(tx_extra.size() + 2 + extra_nonce.size());

diff --git a/src/common/TransactionExtra.h b/src/common/TransactionExtra.h
@@ -85,6 +85,8 @@ namespace CryptoNote
 
     bool addExtraNonceToTransactionExtra(std::vector<uint8_t> &tx_extra, const BinaryArray &extra_nonce);
 
+    bool addPoolNonceToTransactionExtra(std::vector<uint8_t> &tx_extra, const BinaryArray &extra_nonce);
+
     void setPaymentIdToTransactionExtraNonce(BinaryArray &extra_nonce, const Crypto::Hash &payment_id);
 
     bool getPaymentIdFromTransactionExtraNonce(const BinaryArray &extra_nonce, Crypto::Hash &payment_id);

diff --git a/src/config/version.h.in b/src/config/version.h.in
@@ -6,8 +6,8 @@
 #define PROJECT_COPYRIGHT "Copyright 2018-2020, The TurtleCoin Developers"
 #define APP_VER_MAJOR 0
 #define APP_VER_MINOR 28
-#define APP_VER_REV 0
-#define APP_VER_BUILD 1302
+#define APP_VER_REV 1
+#define APP_VER_BUILD 1303
 
 #define BUILD_COMMIT_ID "@VERSION@"
 #define PROJECT_VERSION STR(APP_VER_MAJOR) "." STR(APP_VER_MINOR) "." STR(APP_VER_REV)

diff --git a/src/cryptonotecore/Currency.cpp b/src/cryptonotecore/Currency.cpp
@@ -243,7 +243,7 @@ namespace CryptoNote
         addTransactionPublicKeyToExtra(tx.extra, txkey.publicKey);
         if (!extraNonce.empty())
         {
-            if (!addExtraNonceToTransactionExtra(tx.extra, extraNonce))
+            if (!addPoolNonceToTransactionExtra(tx.extra, extraNonce))
             {
                 return false;
             }