SKALE-1880-fix-ecdsa

Makefile.am

@@ -33,7 +33,7 @@ SUBDIRS=secure_enclave
 ##
 ## SGX_EDGER8R_FLAGS=
 
-
+WALLET_VERSION := $(shell cat VERSION)
 
 ## Needed to make our pattern rule work.
 
@@ -45,11 +45,11 @@ secure_enclave.edl: secure_enclave/secure_enclave.edl
 #AM_CPPFLAGS += -g -Og
 
 
-AM_CFLAGS = -DUSER_SPACE -g -Og -rdynamic -Wl,--no-as-needed -lSegFault
-AM_CXXFLAGS = ${AM_CPPFLAGS} -rdynamic -Wl,--no-as-needed -lSegFault
+AM_CFLAGS = -DUSER_SPACE -g -Og -rdynamic -Wl,--no-as-needed -lSegFault -DSGXWALLET_VERSION="$(WALLET_VERSION)"
+AM_CXXFLAGS = ${AM_CPPFLAGS} -rdynamic -Wl,--no-as-needed -lSegFault -DSGXWALLET_VERSION="$(WALLET_VERSION)"
 
 
-AM_CPPFLAGS += -Wall -DSKALE_SGX=1 -DBINARY_OUTPUT=1 -Ileveldb/include -IlibBLS/bls -IlibBLS/libff -IlibBLS -fno-builtin-memset $(GMP_CPPFLAGS)  -I.  -I./libBLS/deps/deps_inst/x86_or_x64/include
+AM_CPPFLAGS += -DSGXWALLET_VERSION="$(WALLET_VERSION)" -Wall -DSKALE_SGX=1 -DBINARY_OUTPUT=1 -Ileveldb/include -IlibBLS/bls -IlibBLS/libff -IlibBLS -fno-builtin-memset $(GMP_CPPFLAGS)  -I.  -I./libBLS/deps/deps_inst/x86_or_x64/include
 
 ## Additional targets to remove with 'make clean'. You must list
 ## any edger8r generated files here.

SGXWALLET_VERSION

-#define SGXWALLET_VERSION "1.50.2"

SGXWalletServer.cpp

@@ -678,12 +678,10 @@ Json::Value SGXWalletServer::getServerStatusImpl() {
     return result;
 }
 
-Json::Value SGXWalletServer::getServerVersionImpl() {
 
+Json::Value SGXWalletServer::getServerVersionImpl() {
     INIT_RESULT(result)
-
-    result["version"] = SGXWALLET_VERSION;
-
+    result["version"] = TOSTRING(SGXWALLET_VERSION);
     return result;
 }
 

SGXWalletServer.hpp

@@ -33,8 +33,13 @@
 using namespace jsonrpc;
 using namespace std;
 
+#define STRINGIFY(x) #x
+#define TOSTRING(x) STRINGIFY(x)
+
 class SGXWalletServer : public AbstractStubServer {
 
+
+
     recursive_mutex m;
 
     static shared_ptr<SGXWalletServer> server;
@@ -42,6 +47,11 @@ class SGXWalletServer : public AbstractStubServer {
 
 
 public:
+
+    static const char* getVersion() {
+        return TOSTRING(SGXWALLET_VERSION);
+    }
+
     SGXWalletServer(AbstractServerConnector &_connector, serverVersion_t _type);
 
     virtual Json::Value

ServerInit.cpp

@@ -111,7 +111,7 @@ void initAll(uint32_t  _logLevel, bool _checkCert, bool _autoSign) {
 
     static int sgxServerInited;
 
-    cout << "Running sgxwallet version:" << SGXWALLET_VERSION << endl;
+    cout << "Running sgxwallet version:" << SGXWalletServer::getVersion() << endl;
 
     CHECK_STATE(sgxServerInited == 0)
     sgxServerInited = 1;

ServerInit.h

@@ -25,7 +25,6 @@
 #define SGXWALLET_SERVERINIT_H
 
 #include "stdint.h"
-#include "SGXWALLET_VERSION"
 
 #ifdef __cplusplus
 #define EXTERNC extern "C"

testw.cpp

@@ -776,7 +776,7 @@ TEST_CASE_METHOD(TestFixture, "Get ServerStatus", "[get-server-status]") {
 TEST_CASE_METHOD(TestFixture, "Get ServerVersion", "[get-server-version]") {
     HttpClient client(RPC_ENDPOINT);
     StubClient c(client, JSONRPC_CLIENT_V2);
-    REQUIRE(c.getServerVersion()["version"] == SGXWALLET_VERSION);
+    REQUIRE(c.getServerVersion()["version"] == SGXWalletServer::getVersion());
 
 }