Merge pull request #715 from artemii235/etomic

Playing with Jenkins. Always use static nanomsg for cmake build.

CMakeLists.txt

@@ -23,7 +23,7 @@ download_project(PROJ nanomsg
         UPDATE_DISCONNECTED 1
         )
 
-find_library(NANOMSG_LIBRARY NAMES nanomsg PATHS ${DEPS_INSTALL_PREFIX}/lib)
+find_library(NANOMSG_LIBRARY NAMES nanomsg PATHS ${DEPS_INSTALL_PREFIX}/lib NO_DEFAULT_PATH)
 include_directories("${CMAKE_SOURCE_DIR}")
 add_subdirectory(cpp-ethereum)
 add_subdirectory(iguana/exchanges)

Jenkinsfile

@@ -0,0 +1,20 @@
+pipeline {
+  agent {
+    docker {
+      image 'artempikulin/cmake-ubuntu'
+    }
+    
+  }
+  stages {
+    stage('Build') {
+      steps {
+        sh '''git submodule update --init --recursive
+rm -rf build
+mkdir build
+cd build
+cmake ..
+cmake --build . --target marketmaker-testnet'''
+      }
+    }
+  }
+}

iguana/exchanges/LP_commands.c

@@ -375,6 +375,11 @@ jpg(srcfile, destfile, power2=7, password, data="", required, ind=0)\n\
                 jaddbits256(retjson,"privkey",privkey);
                 bitcoin_priv2wif(coin,wiftaddr,wifstr,privkey,wiftype);
                 jaddstr(retjson,"wif",wifstr);
+#ifndef NOTETOMIC
+                char ethaddr[50];
+                LP_etomic_pubkeystr_to_addr(pubsecp, ethaddr);
+                jaddstr(retjson,"ethaddr",ethaddr);
+#endif
                 return(jprint(retjson,1));
             } else return(clonestr("{\"error\":\"need to have passphrase\"}"));
         }

iguana/exchanges/LP_etomic.h

@@ -51,4 +51,6 @@ uint8_t LP_etomic_is_empty_tx_id(char *txId);
 
 uint64_t LP_etomic_get_balance(struct iguana_info *coin, char *coinaddr);
 
+void LP_etomic_pubkeystr_to_addr(char *pubkey, char *output);
+
 #endif //SUPERNET_LP_ETOMIC_H