Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build fix #338

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

build fix #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d06b92
build fix
victoryeo Feb 6, 2021
4d98246
build fix
victoryeo Feb 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ else()
else()
set(ARCH_FLAG "-march=${ARCH}")
endif()
set(WARNINGS "-Wall -Wextra -Wpointer-arith -Wundef -Wvla -Wwrite-strings -Werror -Wno-error=extra -Wno-error=unused-function -Wno-error=deprecated-declarations -Wno-error=sign-compare -Wno-error=strict-aliasing -Wno-error=type-limits -Wno-unused-parameter -Wno-error=unused-variable -Wno-error=undef -Wno-error=uninitialized -Wno-error=unused-result")
set(WARNINGS "-Wall -Wno-error=redundant-move -Wno-error=implicit-fallthrough= -Wno-error=logical-op -Wno-error=terminate -Wextra -Wpointer-arith -Wundef -Wvla -Wwrite-strings -Werror -Wno-error=extra -Wno-error=unused-function -Wno-error=deprecated-declarations -Wno-error=sign-compare -Wno-error=strict-aliasing -Wno-error=type-limits -Wno-unused-parameter -Wno-error=unused-variable -Wno-error=undef -Wno-error=uninitialized -Wno-error=unused-result")
if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
set(WARNINGS "${WARNINGS} -Wno-error=mismatched-tags -Wno-error=null-conversion -Wno-overloaded-shift-op-parentheses -Wno-error=shift-count-overflow -Wno-error=tautological-constant-out-of-range-compare -Wno-error=unused-private-field -Wno-error=unneeded-internal-declaration -Wno-error=unused-function")
else()
Expand Down
4 changes: 2 additions & 2 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ if (MSVC)
target_link_libraries(System ws2_32)
endif ()

target_link_libraries(ConnectivityTool CryptoNoteCore Common Logging Crypto P2P Rpc Http Serialization System ${Boost_LIBRARIES})
target_link_libraries(ConnectivityTool CryptoNoteCore Logging Crypto P2P Rpc Http Serialization Common System ${Boost_LIBRARIES})
target_link_libraries(Daemon CryptoNoteCore P2P Rpc Serialization System Http Logging Common Crypto upnpc-static BlockchainExplorer ${Boost_LIBRARIES})
target_link_libraries(SimpleWallet Wallet NodeRpcProxy Transfers Rpc Http Serialization CryptoNoteCore System Logging Common Crypto ${Boost_LIBRARIES})
target_link_libraries(PaymentGateService PaymentGate JsonRpcServer Wallet NodeRpcProxy Transfers CryptoNoteCore Crypto P2P Rpc Http Serialization System Logging Common InProcessNode upnpc-static BlockchainExplorer ${Boost_LIBRARIES})
Expand All @@ -80,4 +80,4 @@ set_property(TARGET SimpleWallet PROPERTY OUTPUT_NAME "simplewallet")
set_property(TARGET PaymentGateService PROPERTY OUTPUT_NAME "walletd")
set_property(TARGET Miner PROPERTY OUTPUT_NAME "miner")
#TODO Specify the name of daemon for your currency
set_property(TARGET Daemon PROPERTY OUTPUT_NAME "cryptonoted")
set_property(TARGET Daemon PROPERTY OUTPUT_NAME "furiouscoin")
16 changes: 8 additions & 8 deletions src/CryptoNoteConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const uint64_t CRYPTONOTE_MAX_BLOCK_NUMBER = 500000000;
const size_t CRYPTONOTE_MAX_BLOCK_BLOB_SIZE = 500000000;
const size_t CRYPTONOTE_MAX_TX_SIZE = 1000000000;
//TODO Currency-specific address prefix
const uint64_t CRYPTONOTE_PUBLIC_ADDRESS_BASE58_PREFIX = ;
const uint64_t CRYPTONOTE_PUBLIC_ADDRESS_BASE58_PREFIX = 0xe9;
//TODO Choose maturity period for your currency
const size_t CRYPTONOTE_MINED_MONEY_UNLOCK_WINDOW = 60;
const uint64_t CRYPTONOTE_BLOCK_FUTURE_TIME_LIMIT = 60 * 60 * 2;
Expand All @@ -24,7 +24,7 @@ const size_t BLOCKCHAIN_TIMESTAMP_CHECK_WINDOW = 60;
//TODO Specify total number of available coins
//TODO ((uint64_t)(-1)) equals to 18446744073709551616 coins
//TODO or you can define number explicitly UINT64_C(858986905600000000)
const uint64_t MONEY_SUPPLY = ;
const uint64_t MONEY_SUPPLY = (uint64_t)(-1);
const unsigned EMISSION_SPEED_FACTOR = 18;
static_assert(EMISSION_SPEED_FACTOR <= 8 * sizeof(uint64_t), "Bad EMISSION_SPEED_FACTOR");

Expand All @@ -35,7 +35,7 @@ const size_t CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE = 600;
//TODO Define number of digits
const size_t CRYPTONOTE_DISPLAY_DECIMAL_POINT = 8;
//TODO Define minimum fee for transactions
const uint64_t MINIMUM_FEE = ;
const uint64_t MINIMUM_FEE = 100000;
const uint64_t DEFAULT_DUST_THRESHOLD = MINIMUM_FEE;

//TODO Define preferred block's target time
Expand Down Expand Up @@ -73,7 +73,7 @@ const char MINER_CONFIG_FILE_NAME[] = "miner_conf.json"
} // parameters

//TODO Put here the name of your currency
const char CRYPTONOTE_NAME[] = "";
const char CRYPTONOTE_NAME[] = "furiouscoin";
const char GENESIS_COINBASE_TX_HEX[] = "";

const uint8_t CURRENT_TRANSACTION_VERSION = 1;
Expand All @@ -85,9 +85,9 @@ const size_t BLOCKS_SYNCHRONIZING_DEFAULT_COUNT = 200; //by def
const size_t COMMAND_RPC_GET_BLOCKS_FAST_MAX_COUNT = 1000;

//TODO This port will be used by the daemon to establish connections with p2p network
const int P2P_DEFAULT_PORT = ;
const int P2P_DEFAULT_PORT = 12345;
//TODO This port will be used by the daemon to interact with simlewallet
const int RPC_DEFAULT_PORT = ;
const int RPC_DEFAULT_PORT = 12346;

const size_t P2P_LOCAL_WHITE_PEERLIST_LIMIT = 1000;
const size_t P2P_LOCAL_GRAY_PEERLIST_LIMIT = 5000;
Expand All @@ -106,8 +106,8 @@ const char P2P_STAT_TRUSTED_PUB_KEY[] = "8f80f9a5a434a9f1

//TODO Add here your network seed nodes
const std::initializer_list<const char*> SEED_NODES = {
//"your_seed_ip1.com:8080",
//"your_seed_ip2.com:8080",
"111.111.111.111:12345",
"222.222.222.222:12345",
};

struct CheckpointData {
Expand Down
1 change: 1 addition & 0 deletions src/CryptoNoteCore/SwappedMap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include <vector>
#include <boost/archive/binary_oarchive.hpp>
#include <boost/archive/binary_iarchive.hpp>
#include <iostream>

template<class Key, class T> class SwappedMap {
private:
Expand Down
2 changes: 1 addition & 1 deletion src/crypto/chacha8.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ namespace Crypto {
static_assert(sizeof(chacha8_key) <= sizeof(Hash), "Size of hash must be at least that of chacha8_key");
Hash pwd_hash;
cn_slow_hash(context, password.data(), password.size(), pwd_hash);
memcpy(&key, &pwd_hash, sizeof(key));
memcpy((void *)&(key), &pwd_hash, sizeof(key));
memset(&pwd_hash, 0, sizeof(pwd_hash));
}
}
Expand Down