Updated core with tx fee validation fixed and other changes

Karbovanets · Jun 19, 2020 · 7e9dae2 · 7e9dae2
1 parent 46a3677
commit 7e9dae2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/cn_version.cmake b/cn_version.cmake
@@ -60,5 +60,5 @@ if(GIT_FOUND)
     set(PROJECT_VERSION_REV ${PROJECT_GIT_COMMIT_COUNT})
   endif()
 
-  configure_file("cryptonote/src/cnVersion.h.in" "cnVersion.h")
+  configure_file("cryptonote/src/version.h.in" "version.h")
 endif()
diff --git a/cryptonote b/cryptonote
diff --git a/src/gui/AboutDialog.cpp b/src/gui/AboutDialog.cpp
@@ -5,7 +5,7 @@
 #include "AboutDialog.h"
 #include "CurrencyAdapter.h"
 #include "Settings.h"
-#include "cnVersion.h"
+#include "version.h"
 #include "CryptoNoteWalletConfig.h"
 
 #include "ui_aboutdialog.h"
+17 −42		CMakeLists.txt
+0 −48		include/CryptoNote.h
+0 −81		include/CryptoTypes.h
+1 −0		include/INode.h
+1 −1		src/BinaryInfo/connectivity_tool.rc
+1 −1		src/BinaryInfo/daemon.rc
+1 −1		src/BinaryInfo/greenwallet.rc
+1 −1		src/BinaryInfo/miner.rc
+1 −1		src/BinaryInfo/optimizer.rc
+1 −1		src/BinaryInfo/simplewallet.rc
+1 −1		src/BinaryInfo/walletd.rc
+3 −4		src/BlockchainExplorer/BlockchainExplorer.cpp
+2 −4		src/BlockchainExplorer/BlockchainExplorer.h
+2 −1		src/Checkpoints/CheckpointsData.h
+1 −1		src/ConnectivityTool/ConnectivityTool.cpp
+5 −4		src/CryptoNoteCore/TransactionValidator.cpp
+2 −0		src/CryptoNoteCore/TransactionValidator.h
+2 −2		src/CryptoNoteProtocol/CryptoNoteProtocolHandler.cpp
+1 −1		src/Daemon/Daemon.cpp
+1 −1		src/Daemon/DaemonCommandsHandler.cpp
+1 −1		src/GreenWallet/ParseArguments.cpp
+1 −1		src/InProcessNode/InProcessNode.cpp
+1 −0		src/InProcessNode/InProcessNode.h
+5 −1		src/NodeRpcProxy/NodeRpcProxy.cpp
+1 −0		src/NodeRpcProxy/NodeRpcProxy.h
+1 −1		src/P2p/NetNode.cpp
+1 −0		src/PaymentGate/NodeFactory.cpp
+1 −1		src/PaymentGate/PaymentServiceJsonRpcServer.cpp
+1 −1		src/PaymentGateService/ConfigurationManager.cpp
+1 −1		src/PaymentGateService/main.cpp
+55 −26		src/Rpc/RpcServer.cpp
+8 −1		src/Serialization/JsonInputValueSerializer.h
+3 −0		src/Serialization/SerializationTools.h
+1 −1		src/SimpleWallet/SimpleWallet.cpp
+3 −2		src/Wallet/WalletSerializationV2.cpp
+7 −7		src/version.cmake
+0 −0		src/version.h.in