Merge f0f6d1666c into 50a98a4bb1

src/base/tools/cryptonote/BlockTemplate.cpp

@@ -1,8 +1,8 @@
 /* XMRig
  * Copyright (c) 2012-2013 The Cryptonote developers
  * Copyright (c) 2014-2021 The Monero Project
- * Copyright (c) 2018-2023 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2023 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2021 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -207,11 +207,8 @@ bool xmrig::BlockTemplate::parse(bool hashes)
     setOffset(MINER_TX_PREFIX_OFFSET, ar.index());
 
     ar(m_txVersion);
-
-    if (m_coin != Coin::TOWNFORGE) {
+    if (m_coin != Coin::TOWNFORGE)
       ar(m_unlockTime);
-    }
-
     ar(m_numInputs);
 
     // must be 1 input
@@ -284,9 +281,8 @@ bool xmrig::BlockTemplate::parse(bool hashes)
         ar(m_viewTag);
     }
 
-    if (m_coin == Coin::TOWNFORGE) {
+    if (m_coin == Coin::TOWNFORGE)
       ar(m_unlockTime);
-    }
 
     ar(m_extraSize);
 
@@ -344,9 +340,8 @@ bool xmrig::BlockTemplate::parse(bool hashes)
     ar(vin_rct_type);
 
     // no way I'm parsing a full game update here
-    if (m_coin == Coin::TOWNFORGE && m_height % 720 == 0) {
+    if (m_coin == Coin::TOWNFORGE && m_height % 720 == 0)
       return true;
-    }
 
     // must be RCTTypeNull (0)
     if (vin_rct_type != 0) {

src/base/tools/cryptonote/WalletAddress.cpp

@@ -1,8 +1,8 @@
 /* XMRig
  * Copyright (c) 2012-2013 The Cryptonote developers
  * Copyright (c) 2014-2021 The Monero Project
- * Copyright (c) 2018-2023 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2023 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2021 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -34,7 +34,8 @@
 bool xmrig::WalletAddress::decode(const char *address, size_t size)
 {
     uint64_t tf_tag = 0;
-    if (size >= 4 && !strncmp(address, "TF", 2)) {
+    if (size >= 4 && !strncmp(address, "TF", 2))
+    {
       tf_tag = 0x424200;
       switch (address[2])
       {
@@ -133,9 +134,8 @@ bool xmrig::WalletAddress::decode(const char *address, size_t size)
         if (memcmp(m_checksum, md, sizeof(m_checksum)) == 0) {
             m_data = { address, size };
 
-            if (tf_tag) {
+            if (tf_tag)
               m_tag = tf_tag;
-            }
 
             return true;
         }