Merge branch 'dev3' into mainnet

Author: freenetcoder

CMakeLists.txt

@@ -1,14 +1,28 @@
 cmake_minimum_required(VERSION 3.1)
 
 set(VERSION_MAJOR 10)
-set(VERSION_MINOR 1)
+set(VERSION_MINOR 2)
 set(VERSION_REVISION 0)
 set(GIT_COMMIT_HASH "unknown")
 
-set(GRIMM_SUFFIX_LOWER_CASE "mainnet")
-set(GRIMM_SUFFIX_UPPER_CASE "Mainnet")
-set(GRIMM_TARGET_SUFFIX "-${GRIMM_SUFFIX_LOWER_CASE}")
-set(GRIMM_DISPLAY_SUFFIX " ${GRIMM_SUFFIX_UPPER_CASE}")
+# uncoment next line for testnet
+set(GRIMM_TESTNET TRUE)
+
+if(GRIMM_TESTNET)
+    add_definitions(-DGRIMM_TESTNET)
+    set(GRIMM_SUFFIX_LOWER_CASE "testnet")
+    set(GRIMM_SUFFIX_UPPER_CASE "Testnet")
+    set(GRIMM_TARGET_SUFFIX "-${GRIMM_SUFFIX_LOWER_CASE}")
+    set(GRIMM_DISPLAY_SUFFIX " ${GRIMM_SUFFIX_UPPER_CASE}")
+else()
+    set(GRIMM_SUFFIX_LOWER_CASE "mainnet")
+    set(GRIMM_SUFFIX_UPPER_CASE "Mainnet")
+    set(GRIMM_TARGET_SUFFIX "-${GRIMM_SUFFIX_LOWER_CASE}")
+    set(GRIMM_DISPLAY_SUFFIX " ${GRIMM_SUFFIX_UPPER_CASE}")
+
+endif()
+
+
 
 if (GRIMM_SIGN_PACKAGE AND WIN32)
   #  add_custom_target(signing ALL DEPENDS grimm-wallet-ui COMMENT "Signing Package...")
@@ -110,11 +124,6 @@ if (GRIMM_CPU_ARCH MATCHES "avx")
     set(GRIMM_USE_AVX TRUE)
 endif()
 
-if(GRIMM_USE_GPU)
-    add_definitions(-DGRIMM_USE_GPU)
-    set(GRIMM_USE_AVX TRUE)
-endif()
-
 if(GRIMM_USE_AVX)
     add_definitions(-DGRIMM_USE_AVX)
 endif()
@@ -144,28 +153,6 @@ if(SHOW_CODE_LOCATION)
     add_definitions(-DSHOW_CODE_LOCATION=1)
 endif()
 
-# uncoment next line for testnet
-#set(GRIMM_TESTNET TRUE)
-# uncoment next line for mainnet
-#set(GRIMM_MAINNET TRUE)
-
-if(GRIMM_TESTNET)
-    add_definitions(-DGRIMM_TESTNET)
-    set(GRIMM_SUFFIX_LOWER_CASE "testnet")
-    set(GRIMM_SUFFIX_UPPER_CASE "Testnet")
-    set(GRIMM_TARGET_SUFFIX "-${GRIMM_SUFFIX_LOWER_CASE}")
-    set(GRIMM_DISPLAY_SUFFIX " ${GRIMM_SUFFIX_UPPER_CASE}")
-elseif(GRIMM_MAINNET)
-    add_definitions(-DGRIMM_MAINNET)
-    set(GRIMM_SUFFIX_LOWER_CASE "")
-    set(GRIMM_SUFFIX_UPPER_CASE "")
-    set(GRIMM_TARGET_SUFFIX "")
-    set(GRIMM_DISPLAY_SUFFIX "")
-endif()
-
-
-
-
 
 if(MSVC)
     if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")

README.md

@@ -4,7 +4,9 @@
 - [Website grimmw.com](https://grimmw.com)
 ### Current status
 
-#### Mainnet online. First block "timestamp":1564997815 Aug. 5th, 2019 @ 9:36am (UTC)
+#### Mainnet online. First block "timestamp":1564997815 Aug. 5th, 2019 @ 9:36am (UTC) [mainnet branch](https://github.com/freenetcoder/grimm/tree/mainnet)
+
+#### Testnet online [testnet branch](https://github.com/freenetcoder/grimm/tree/testnet)
 
 
 
@@ -24,6 +26,10 @@ We designed Grimm so that it doesn’t depend on any one person. We don’t cont
 
 [English](https://t.me/grimmw) | [Русский](https://t.me/grimmwru)
 
+### DISCORD
+
+[invite link](https://discord.gg/XKgPPW2)
+
 ### EITHER HELP US, OR GET OUT OF OUR WAY
 
 [twitter](https://twitter.com/grimmwcom) | [medium](https://medium.com/grimmwcom) | [bitcointalk](https://bitcointalk.org)
@@ -64,7 +70,7 @@ Add .../qt511/5.11.1/msvc2017_64/bin and .../boost_1_68_0/lib64-msvc-14.1 to the
 - Go to CMake -> Cache -> Open Cache Folder -> grimm (you'll find binaries in grimm/..., wallet/..., ui/..., explorer/... subfolders).
 
 ### Linux
-### Ubuntu 14.04
+### Ubuntu 18.04
 - Install gcc7 boost ssl packages.
   sudo add-apt-repository ppa:ubuntu-toolchain-r/test
   sudo apt update

android/node_model.cpp

@@ -132,13 +132,6 @@ std::vector<std::string> NodeModel::getLocalNodePeers()
     return getDefaultPeers();
 }
 
-#ifdef GRIMM_USE_GPU
-std::unique_ptr<IExternalPOW> NodeModel::getStratumServer()
-{
-    return nullptr;
-}
-#endif //  GRIMM_USE_GPU
-
 void NodeModel::onNodeThreadFinished()
 {
     JNIEnv* env = Android_JNI_getEnv();

android/node_model.h

@@ -48,10 +48,7 @@ class NodeModel
     std::string getLocalNodeStorage() override;
     std::string getTempDir() override;
     std::vector<std::string> getLocalNodePeers() override;
-    #ifdef GRIMM_USE_GPU
-    std::unique_ptr<grimm::IExternalPOW> getStratumServer() override;
-    #endif //  GRIMM_USE_GPU
-
+  
     void onNodeThreadFinished() override;
 
 private:

core/block_crypt.cpp

@@ -989,8 +989,22 @@ namespace grimm
 		}
 	}
 
+	bool Rules::IsForkHeightsConsistent() const
+	{
+		if (pForks[0].m_Height != Rules::HeightGenesis - 1)
+			return false;
+
+		for (size_t i = 1; i < _countof(pForks); i++)
+			if (pForks[i].m_Height < pForks[i - 1].m_Height)
+				return false;
+
+		return true;
+	}
+
 	void Rules::UpdateChecksum()
 	{
+		if (!IsForkHeightsConsistent())
+			throw std::runtime_error("Inconsistent Forks");
 		// all parameters, including const (in case they'll be hardcoded to different values in later versions)
 		ECC::Oracle oracle;
 		oracle
@@ -1021,7 +1035,7 @@ namespace grimm
 			<< (uint32_t) Block::PoW::N
 			<< (uint32_t) Block::PoW::NonceType::nBits
 			<< uint32_t(16) // increment this whenever we change something in the protocol
-#ifndef GRIMM_TESTNET
+#ifndef GRIMM_TESTNET1
             << "masternet"
 #endif
 			// out
@@ -1034,6 +1048,14 @@ namespace grimm
 			<< DA.Damp.N
 			// out
 			>> pForks[1].m_Hash;
+
+			oracle
+			<< "fork2"
+			<< pForks[2].m_Height
+			// TBD
+			// ...
+			// out
+			>> pForks[2].m_Hash;
 	}
 
 	const HeightHash* Rules::FindFork(const Merkle::Hash& hv) const

core/block_crypt.h

@@ -148,14 +148,15 @@ namespace grimm
 		static void get_Emission(AmountBig::Type&, const HeightRange&);
 		static void get_Emission(AmountBig::Type&, const HeightRange&, Amount base);
 
-		HeightHash pForks[2];
+		HeightHash pForks[3];
 
 		const HeightHash& get_LastFork() const;
 		const HeightHash* FindFork(const Merkle::Hash&) const;
 		std::string get_SignatureStr() const;
 
 	private:
 		Amount get_EmissionEx(Height, Height& hEnd, Amount base) const;
+		bool IsForkHeightsConsistent() const;
 	};
 
 	class SwitchCommitment

core/proto.cpp

@@ -759,9 +759,14 @@ void NodeConnection::OnLoginInternal(Height hScheme, Login&& msg)
 		}
 	}
 
-	Height hMinScheme = get_MinPeerFork();
-	if (hScheme < hMinScheme)
-		ThrowUnexpected("Legacy", NodeProcessingException::Type::Incompatible);
+  if (hScheme < MaxHeight)
+	{
+		LOG_WARNING() << "Peer " << m_Connection->peer_address() << " incompatible with fork " << (hScheme + 1);
+
+		Height hMinScheme = get_MinPeerFork();
+		if (hScheme < hMinScheme)
+			ThrowUnexpected("Legacy", NodeProcessingException::Type::Incompatible);
+	}
 
 	OnLogin(std::move(msg));
 }

explorer/adapter.cpp

@@ -116,8 +116,8 @@ class Adapter : public Node::IObserver, public IAdapter {
 
 private:
     void init_helper_fragments() {
-        static const char* s = "[,]";
-        io::SharedBuffer buf(s, 3);
+        static const char* s = "[,]\"";
+        io::SharedBuffer buf(s, 4);
         _leftBrace = buf;
         _leftBrace.size = 1;
         _comma = buf;
@@ -126,6 +126,9 @@ class Adapter : public Node::IObserver, public IAdapter {
         _rightBrace = buf;
         _rightBrace.size = 1;
         _rightBrace.data += 2;
+        _quote = buf;
+        _quote.size = 1;
+        _quote.data += 3;
     }
 
     /// Returns body for /status request
@@ -174,7 +177,8 @@ class Adapter : public Node::IObserver, public IAdapter {
                     { "height", _cache.currentHeight },
                     { "low_horizon", _nodeBackend.m_Extra.m_LoHorizon },
                     { "hash", hash_to_hex(buf, cursor.m_ID.m_Hash) },
-                    { "chainwork",  uint256_to_hex(buf, cursor.m_Full.m_ChainWork) }
+                    { "chainwork",  uint256_to_hex(buf, cursor.m_Full.m_ChainWork) },
+                    { "peers_count", _node.get_AcessiblePeerCount() }
                 }
             )) {
                 return false;
@@ -389,14 +393,42 @@ class Adapter : public Node::IObserver, public IAdapter {
         return true;
     }
 
+    bool get_peers(io::SerializedMsg& out) override
+    {
+        auto& peers = _node.get_AcessiblePeerAddrs();
+
+        out.push_back(_leftBrace);
+
+        for (auto& peer : peers)
+        {
+            auto addr = peer.get_ParentObj().m_Addr.m_Value.str();
+
+            {
+                out.push_back(_quote);
+                out.push_back({ addr.data(), addr.size() });
+                out.push_back(_quote);
+            }
+
+            out.push_back(_comma);
+        }
+
+        // remove last comma
+        if (!peers.empty())
+            out.pop_back();
+
+        out.push_back(_rightBrace);
+
+        return true;
+    }
+
     HttpMsgCreator _packer;
 
     // node db interface
 	Node& _node;
     NodeProcessor& _nodeBackend;
 
     // helper fragments
-    io::SharedBuffer _leftBrace, _comma, _rightBrace;
+    io::SharedBuffer _leftBrace, _comma, _rightBrace, _quote;
 
     // If true then status boby needs to be refreshed
     bool _statusDirty;
@@ -418,4 +450,3 @@ IAdapter::Ptr create_adapter(Node& node) {
 }
 
 }} //namespaces
-

explorer/adapter.h

@@ -37,6 +37,8 @@ struct IAdapter {
     virtual bool get_block_by_kernel(io::SerializedMsg& out, const ByteBuffer& key) = 0;
 
     virtual bool get_blocks(io::SerializedMsg& out, uint64_t startHeight, uint64_t n) = 0;
+
+    virtual bool get_peers(io::SerializedMsg& out) = 0;
 };
 
 IAdapter::Ptr create_adapter(Node& node);

explorer/server.cpp

@@ -31,7 +31,7 @@ static const unsigned SERVER_RESTART_INTERVAL = 1000;
 static const unsigned ACL_REFRESH_INTERVAL = 5555;
 
 enum Dirs {
-    DIR_STATUS, DIR_BLOCK, DIR_BLOCKS
+    DIR_STATUS, DIR_BLOCK, DIR_BLOCKS, DIR_PEERS
     // etc
 };
 
@@ -112,7 +112,7 @@ bool Server::on_request(uint64_t id, const HttpMsgReader::Message& msg) {
     const std::string& path = msg.msg->get_path();
 
     static const std::map<std::string_view, int> dirs {
-        { "status", DIR_STATUS }, { "block", DIR_BLOCK }, { "blocks", DIR_BLOCKS }
+        { "status", DIR_STATUS }, { "block", DIR_BLOCK }, { "blocks", DIR_BLOCKS }, { "peers", DIR_PEERS}
     };
 
     const HttpConnection::Ptr& conn = it->second;
@@ -130,6 +130,9 @@ bool Server::on_request(uint64_t id, const HttpMsgReader::Message& msg) {
             case DIR_BLOCKS:
                 func = &Server::send_blocks;
                 break;
+            case DIR_PEERS:
+                func = &Server::send_peers;
+                break;
             default:
                 break;
         }
@@ -182,7 +185,7 @@ bool Server::send_block(const HttpConnection::Ptr &conn) {
             return send(conn, 500, "Internal error #2");
         }
     }
-    else 
+    else
     {
         auto height = _currentUrl.get_int_arg("height", 0);
         if (!_backend.get_block(_body, height)) {
@@ -205,6 +208,13 @@ bool Server::send_blocks(const HttpConnection::Ptr& conn) {
     return send(conn, 200, "OK");
 }
 
+bool Server::send_peers(const HttpConnection::Ptr& conn) {
+    if (!_backend.get_peers(_body)) {
+        return send(conn, 500, "Internal error #3");
+    }
+    return send(conn, 200, "OK");
+}
+
 bool Server::send(const HttpConnection::Ptr& conn, int code, const char* message) {
     assert(conn);