forked from lthn/blockchain
Merge branch 'release' into develop
This commit is contained in:
commit
7a5fb3ee25
9 changed files with 10 additions and 17 deletions
|
|
@ -182,7 +182,7 @@ namespace net_utils
|
|||
*
|
||||
*/
|
||||
inline
|
||||
virtual void stop(std::string& OUT collect_remains)
|
||||
virtual void stop(std::string& OUT collect_remains) override
|
||||
{
|
||||
}
|
||||
protected:
|
||||
|
|
|
|||
|
|
@ -4274,7 +4274,7 @@ namespace currency
|
|||
{
|
||||
payment_id.clear();
|
||||
blobdata blob;
|
||||
uint64_t prefix;
|
||||
uint64_t prefix{};
|
||||
if (!tools::base58::decode_addr(str, prefix, blob))
|
||||
{
|
||||
LOG_PRINT_L1("Invalid address format: base58 decoding failed for \"" << str << "\"");
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
// Copyright (c) 2014-2018 Zano Project
|
||||
// Copyright (c) 2014-2025 Zano Project
|
||||
// Copyright (c) 2014-2018 The Louisdor Project
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
#include "genesis.h"
|
||||
|
||||
namespace currency
|
||||
|
|
@ -17,4 +16,3 @@ namespace currency
|
|||
{0x00,0x00}};
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
// Copyright (c) 2014-2018 Zano Project
|
||||
// Copyright (c) 2014-2018 Zano Project
|
||||
// Copyright (c) 2014-2025 Zano Project
|
||||
// Copyright (c) 2014-2018 The Louisdor Project
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
#pragma once
|
||||
#pragma once
|
||||
#include <string>
|
||||
#include <cstdint>
|
||||
|
||||
namespace currency
|
||||
{
|
||||
#pragma pack(push, 1)
|
||||
|
|
@ -17,7 +17,7 @@ namespace currency
|
|||
};
|
||||
|
||||
#else
|
||||
struct genesis_tx_raw_data
|
||||
struct genesis_tx_raw_data
|
||||
{
|
||||
uint64_t const v[42];
|
||||
uint8_t const r[2];
|
||||
|
|
@ -26,7 +26,3 @@ namespace currency
|
|||
#pragma pack(pop)
|
||||
extern const genesis_tx_raw_data ggenesis_tx_raw;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,10 @@
|
|||
// Copyright (c) 2014-2020 Zano Project
|
||||
// Copyright (c) 2014-2025 Zano Project
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
#include <cstdint>
|
||||
#include "../common/error_codes.h"
|
||||
|
||||
namespace plain_wallet
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Add table
Reference in a new issue