From 44f052f83b4ebb727cf4959ff6b4b2de680cb946 Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Sat, 1 Mar 2014 13:38:13 +0000 Subject: [PATCH 1/2] Minor cmake style changes. --- CMakeLists.txt | 6 +++--- TODO | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index edcf6d58e..fa9a3d265 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -141,10 +141,10 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") # Generate header file containing useful build information -execute_process(COMMAND git --git-dir=${CMAKE_CURRENT_SOURCE_DIR}/.git --work-tree=${CMAKE_CURRENT_SOURCE_DIR} rev-parse HEAD OUTPUT_VARIABLE commit_hash OUTPUT_STRIP_TRAILING_WHITESPACE) -message("Commit Hash: ${commit_hash}") +execute_process(COMMAND git --git-dir=${CMAKE_CURRENT_SOURCE_DIR}/.git --work-tree=${CMAKE_CURRENT_SOURCE_DIR} rev-parse HEAD OUTPUT_VARIABLE ETH_COMMIT_HASH OUTPUT_STRIP_TRAILING_WHITESPACE) +message("Commit Hash: ${ETH_COMMIT_HASH}") file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/BuildInfo.h "// This file was automatically generated by cmake\n#pragma once\n\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/BuildInfo.h "#define ETH_COMMIT_HASH ${commit_hash}\n#define ETH_BUILD_TYPE ${CMAKE_BUILD_TYPE}\n#define ETH_BUILD_PLATFORM ${ETH_BUILD_PLATFORM}\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/BuildInfo.h "#define ETH_COMMIT_HASH ${ETH_COMMIT_HASH}\n#define ETH_BUILD_TYPE ${CMAKE_BUILD_TYPE}\n#define ETH_BUILD_PLATFORM ${ETH_BUILD_PLATFORM}\n") include_directories(${CMAKE_CURRENT_BINARY_DIR}) add_subdirectory(secp256k1) diff --git a/TODO b/TODO index a1dc5d9f1..cabece70e 100644 --- a/TODO +++ b/TODO @@ -18,6 +18,7 @@ Network: - Useful/useless - new blocks/transactions or useful peers? - Solid communications? - Strategy for peer suggestion? +- Ignore transactions with future nonces until address's nonce changes. Cleanups & caching - All caches should flush unused data (I'm looking at you, BlockChain) to avoid memory overload. From bc876b38fc85c08a70ced81ab6941069484ce252 Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Sat, 1 Mar 2014 13:52:14 +0000 Subject: [PATCH 2/2] Clean repo reporting. --- CMakeLists.txt | 17 ++++++++++++----- alethzero/MainWin.cpp | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fa9a3d265..090fdc576 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -131,10 +131,10 @@ else () # Always "found", given last block. include_directories(${CRYPTOPP_INCLUDE_DIR}) - if (NOT APPLE) + if(NOT APPLE) link_directories(${CRYPTOPP_LIBRARIES}) - endif () -endif () + endif() +endif() if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") link_directories(/usr/local/lib) @@ -142,9 +142,16 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") # Generate header file containing useful build information execute_process(COMMAND git --git-dir=${CMAKE_CURRENT_SOURCE_DIR}/.git --work-tree=${CMAKE_CURRENT_SOURCE_DIR} rev-parse HEAD OUTPUT_VARIABLE ETH_COMMIT_HASH OUTPUT_STRIP_TRAILING_WHITESPACE) -message("Commit Hash: ${ETH_COMMIT_HASH}") +execute_process(COMMAND git --git-dir=${CMAKE_CURRENT_SOURCE_DIR}/.git --work-tree=${CMAKE_CURRENT_SOURCE_DIR} diff --shortstat OUTPUT_VARIABLE ETH_LOCAL_CHANGES OUTPUT_STRIP_TRAILING_WHITESPACE) +if("x${ETH_LOCAL_CHANGES}" STREQUAL "x") + set(ETH_CLEAN_REPO 1) +else() + set(ETH_CLEAN_REPO 0) +endif() + +message("Commit Hash: ${ETH_COMMIT_HASH} (Clean: ${ETH_CLEAN_REPO} - ${ETH_LOCAL_CHANGES})") file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/BuildInfo.h "// This file was automatically generated by cmake\n#pragma once\n\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/BuildInfo.h "#define ETH_COMMIT_HASH ${ETH_COMMIT_HASH}\n#define ETH_BUILD_TYPE ${CMAKE_BUILD_TYPE}\n#define ETH_BUILD_PLATFORM ${ETH_BUILD_PLATFORM}\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/BuildInfo.h "#define ETH_COMMIT_HASH ${ETH_COMMIT_HASH}\n#define ETH_CLEAN_REPO ${ETH_CLEAN_REPO}\n#define ETH_BUILD_TYPE ${CMAKE_BUILD_TYPE}\n#define ETH_BUILD_PLATFORM ${ETH_BUILD_PLATFORM}\n") include_directories(${CMAKE_CURRENT_BINARY_DIR}) add_subdirectory(secp256k1) diff --git a/alethzero/MainWin.cpp b/alethzero/MainWin.cpp index e2e84ef63..83ceab115 100644 --- a/alethzero/MainWin.cpp +++ b/alethzero/MainWin.cpp @@ -180,7 +180,7 @@ Address Main::fromString(QString const& _a) const void Main::on_about_triggered() { - QMessageBox::about(this, "About AlethZero PoC-" + QString(ETH_QUOTED(ETH_VERSION)).section('.', 1, 1), "AlethZero/v" ETH_QUOTED(ETH_VERSION) "/" ETH_QUOTED(ETH_BUILD_TYPE) "/" ETH_QUOTED(ETH_BUILD_PLATFORM) "\nBy Gav Wood, 2014.\nBased on a design by Vitalik Buterin.\n\nTeam Ethereum++ includes: Eric Lombrozo, Marko Simovic, Alex Leverington, Tim Hughes and several others."); + QMessageBox::about(this, "About AlethZero PoC-" + QString(ETH_QUOTED(ETH_VERSION)).section('.', 1, 1), QString("AlethZero/v" ETH_QUOTED(ETH_VERSION) "/" ETH_QUOTED(ETH_BUILD_TYPE) "/" ETH_QUOTED(ETH_BUILD_PLATFORM) "\n" ETH_QUOTED(ETH_COMMIT_HASH)) + (ETH_CLEAN_REPO ? "\nCLEAN" : "\n+ LOCAL CHANGES") + "\n\nBy Gav Wood, 2014.\nBased on a design by Vitalik Buterin.\n\nTeam Ethereum++ includes: Eric Lombrozo, Marko Simovic, Alex Leverington, Tim Hughes and several others."); } void Main::writeSettings()