Merge pull request #1500 from skalenetwork/develop

New beta
skalenetwork · Apr 14, 2023 · e200fed · e200fed
2 parents 95d454e + ba2af14
commit e200fed
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 12 deletions.
diff --git a/libconsensus b/libconsensus
diff --git a/libethereum/Client.cpp b/libethereum/Client.cpp
@@ -1512,11 +1512,12 @@ uint64_t Client::getHistoricRootsDbUsage() const {
 }
 #endif  // HISTORIC_STATE
 
-uint64_t Client::submitOracleRequest( const string& _spec, string& _receipt ) {
+uint64_t Client::submitOracleRequest(
+    const string& _spec, string& _receipt, string& _errorMessage ) {
     assert( m_skaleHost );
     uint64_t status = -1;
     if ( m_skaleHost )
-        status = m_skaleHost->submitOracleRequest( _spec, _receipt );
+        status = m_skaleHost->submitOracleRequest( _spec, _receipt, _errorMessage );
     else
         throw runtime_error( "Instance of SkaleHost was not properly created." );
     return status;

diff --git a/libethereum/Client.h b/libethereum/Client.h
@@ -322,7 +322,7 @@ class Client : public ClientBase, protected Worker {
     uint64_t getHistoricRootsDbUsage() const;
 #endif  // HISTORIC_STATE
 
-    uint64_t submitOracleRequest( const string& _spec, string& _receipt );
+    uint64_t submitOracleRequest( const string& _spec, string& _receipt, string& _errorMessage );
     uint64_t checkOracleResult( const string& _receipt, string& _result );
 
     SkaleDebugInterface::handler getDebugHandler() const { return m_debugHandler; }

diff --git a/libethereum/SkaleHost.cpp b/libethereum/SkaleHost.cpp
@@ -983,8 +983,9 @@ std::array< std::string, 4 > SkaleHost::getIMABLSPublicKey() const {
     return m_client.getIMABLSPublicKey();
 }
 
-uint64_t SkaleHost::submitOracleRequest( const string& _spec, string& _receipt ) {
-    return m_consensus->submitOracleRequest( _spec, _receipt );
+uint64_t SkaleHost::submitOracleRequest(
+    const string& _spec, string& _receipt, string& _errorMessage ) {
+    return m_consensus->submitOracleRequest( _spec, _receipt, _errorMessage );
 }
 
 uint64_t SkaleHost::checkOracleResult( const string& _receipt, string& _result ) {

diff --git a/libethereum/SkaleHost.h b/libethereum/SkaleHost.h
@@ -127,7 +127,7 @@ class SkaleHost {
     std::map< std::string, uint64_t > getConsensusDbUsage() const;
     std::array< std::string, 4 > getIMABLSPublicKey() const;
 
-    uint64_t submitOracleRequest( const string& _spec, string& _receipt );
+    uint64_t submitOracleRequest( const string& _spec, string& _receipt, string& _errorMessage );
     uint64_t checkOracleResult( const string& _receipt, string& _result );
 
     void pauseConsensus( bool _pause ) {

diff --git a/libweb3jsonrpc/Skale.cpp b/libweb3jsonrpc/Skale.cpp
@@ -520,11 +520,13 @@ std::string Skale::oracle_submitRequest( std::string& request ) {
         if ( m_client.chainParams().nodeInfo.syncNode )
             throw std::runtime_error( "Oracle is disabled on this instance" );
         std::string receipt;
-        // this function is guaranteed not to throw exceptions
-        uint64_t status = m_client.submitOracleRequest( request, receipt );
+        std::string errorMessage;
+
+        clog( VerbosityDebug, "Oracle request:" ) << request;
+
+        uint64_t status = this->m_client.submitOracleRequest( request, receipt, errorMessage );
         if ( status != ORACLE_SUCCESS ) {
-            throw jsonrpc::JsonRpcException(
-                status, skutils::tools::format( "Oracle request failed with status %zu", status ) );
+            throw jsonrpc::JsonRpcException( status, errorMessage );
         }
         return receipt;
     } catch ( jsonrpc::JsonRpcException const& e ) {
@@ -550,6 +552,7 @@ std::string Skale::oracle_checkResult( std::string& receipt ) {
             throw jsonrpc::JsonRpcException(
                 status, skutils::tools::format( "Oracle request failed with status %zu", status ) );
         }
+        clog( VerbosityDebug, "Oracle result:" ) << result;
         return result;
     } catch ( jsonrpc::JsonRpcException const& e ) {
         throw e;

diff --git a/test/unittests/libethereum/SkaleHost.cpp b/test/unittests/libethereum/SkaleHost.cpp
@@ -81,7 +81,7 @@ class ConsensusTestStub : public ConsensusInterface {
     }
 
     uint64_t submitOracleRequest( const string& /*_spec*/, string&
-                          /*_receipt*/) override {
+                          /*_receipt*/, string& ) override {
         return 0;
     }