Merge pull request #296 from skalenetwork/bug/SKALE-2810-pass-sgx-par…

…ameters SKALE-2810 read blsPublicKey from config
skalenetwork · Jun 26, 2020 · 380fa2b · 380fa2b
2 parents b7d7688 + d2987d7
commit 380fa2b
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/libconsensus b/libconsensus
diff --git a/libethcore/ChainOperationParams.h b/libethcore/ChainOperationParams.h
@@ -114,6 +114,7 @@ struct sChainNode {
     u256 port6;
     u256 sChainIndex;
     std::string publicKey;
+    std::array< std::string, 4 > blsPublicKey;
 };
 
 /// skale
@@ -135,8 +136,8 @@ struct SChain {
 
         // HACK This creates one node and allows to run tests - BUT when loading config we need to
         // delete this explicitly!!
-        sChainNode me = {
-            u256( 1 ), "127.0.0.11", u256( 11111 ), "::1", u256( 11111 ), u256( 1 ), "0xfa"};
+        sChainNode me = {u256( 1 ), "127.0.0.11", u256( 11111 ), "::1", u256( 11111 ), u256( 1 ),
+            "0xfa", {"0", "1", "0", "1"}};
         nodes.push_back( me );
     }
 };

diff --git a/libethereum/ChainParams.cpp b/libethereum/ChainParams.cpp
@@ -209,6 +209,12 @@ ChainParams ChainParams::loadConfig(
             }
             node.sChainIndex = nodeConfObj.at( "schainIndex" ).get_uint64();
             node.publicKey = nodeConfObj.at( "publicKey" ).get_str();
+            if ( !keyShareName.empty() ) {
+                node.blsPublicKey[0] = nodeConfObj.at( "blsPublicKey0" ).get_str();
+                node.blsPublicKey[1] = nodeConfObj.at( "blsPublicKey1" ).get_str();
+                node.blsPublicKey[2] = nodeConfObj.at( "blsPublicKey2" ).get_str();
+                node.blsPublicKey[3] = nodeConfObj.at( "blsPublicKey3" ).get_str();
+            }
             s.nodes.push_back( node );
         }
         cp.sChain = s;

diff --git a/libethereum/SkaleHost.cpp b/libethereum/SkaleHost.cpp
@@ -110,16 +110,10 @@ void DefaultConsensusFactory::fillSgxInfo( ConsensusEngine& consensus ) const {
     for ( const auto& node : m_client.chainParams().sChain.nodes ) {
         std::vector< std::string > public_key_share( 4 );
         if ( node.id != this->m_client.chainParams().nodeInfo.id ) {
-            jsonrpc::HttpClient* jsonRpcClient = new jsonrpc::HttpClient(
-                "http://" + node.ip + ':' + ( node.port + 3 ).convert_to< std::string >() );
-            SkaleClient skaleClient( *jsonRpcClient );
-
-            Json::Value joPublicKeyResponse = skaleClient.skale_imaInfo();
-
-            public_key_share[0] = joPublicKeyResponse["insecureBLSPublicKey0"].asString();
-            public_key_share[1] = joPublicKeyResponse["insecureBLSPublicKey1"].asString();
-            public_key_share[2] = joPublicKeyResponse["insecureBLSPublicKey2"].asString();
-            public_key_share[3] = joPublicKeyResponse["insecureBLSPublicKey3"].asString();
+            public_key_share[0] = node.blsPublicKey[0];
+            public_key_share[1] = node.blsPublicKey[1];
+            public_key_share[2] = node.blsPublicKey[2];
+            public_key_share[3] = node.blsPublicKey[3];
         } else {
             public_key_share[0] = this->m_client.chainParams().nodeInfo.insecureBLSPublicKeys[0];
             public_key_share[1] = this->m_client.chainParams().nodeInfo.insecureBLSPublicKeys[1];

diff --git a/test/unittests/mapreduce_consensus/ConsensusEngine.cpp b/test/unittests/mapreduce_consensus/ConsensusEngine.cpp
@@ -193,7 +193,7 @@ class ConsensusExtFaceFixture : public ConsensusExtFace {
         chainParams.gasLimit = chainParams.maxGasLimit;
         chainParams.extraData = h256::random().asBytes();
 
-        sChainNode node2{u256( 2 ), "127.0.0.12", u256( 11111 ), "::1", u256( 11111 ), u256( 1 ), "0xfa"};
+        sChainNode node2{u256( 2 ), "127.0.0.12", u256( 11111 ), "::1", u256( 11111 ), u256( 1 ), "0xfa", {"0", "1", "0", "1"}};
         chainParams.sChain.nodes.push_back( node2 );
         //////////////////////////////////////////////
+1 −1		crypto/ConsensusBLSSignature.cpp
+4 −2		crypto/ConsensusSigShareSet.cpp
+11 −26		crypto/CryptoManager.cpp
+1 −1		libBLS
+0 −3		run_sgx_test/docker-compose.yml
+1 −1		sgxwallet