CrimsonHawk/xmrig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Code style cleanup.

Browse source
This commit is contained in:
XMRig 2023-12-29 21:17:19 +07:00
parent 50a98a4bb1
commit 07e1e77c4f
No known key found for this signature in database
GPG key ID: 446A53638BE94409
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/base/tools/cryptonote/BlockTemplate.cpp
View file

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

10
src/base/tools/cryptonote/WalletAddress.cpp
View file

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