From 53d0bdf5051556f6e69559a16e22029b1ad6eb04 Mon Sep 17 00:00:00 2001 From: Artem Pikulin Date: Fri, 23 Mar 2018 15:19:05 +0700 Subject: [PATCH 01/15] Add ethaddr field to calcaddress response if ETOMIC is enabled. --- iguana/exchanges/LP_commands.c | 5 +++++ iguana/exchanges/LP_etomic.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/iguana/exchanges/LP_commands.c b/iguana/exchanges/LP_commands.c index 3a862ac0a..abad115b0 100644 --- a/iguana/exchanges/LP_commands.c +++ b/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\"}")); } diff --git a/iguana/exchanges/LP_etomic.h b/iguana/exchanges/LP_etomic.h index 31da07237..af5de5f63 100644 --- a/iguana/exchanges/LP_etomic.h +++ b/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 From f6bbff2027e267344cc45db9baf256c01aa032d8 Mon Sep 17 00:00:00 2001 From: Artem Pikulin Date: Fri, 23 Mar 2018 12:18:47 +0300 Subject: [PATCH 02/15] Added Jenkinsfile --- Jenkinsfile | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000000000..cbdcc10b1 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,16 @@ +pipeline { + agent { + docker { + image 'artempikulin/cmake-ubuntu' + args '-v .:/home/SuperNET -w /home/SuperNET' + } + + } + stages { + stage('Build') { + steps { + build 'Cmake' + } + } + } +} \ No newline at end of file From 59a2763fef401ad9e8f21278684afaedbcce9785 Mon Sep 17 00:00:00 2001 From: Artem Pikulin Date: Fri, 23 Mar 2018 12:29:39 +0300 Subject: [PATCH 03/15] Added Jenkinsfile --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index cbdcc10b1..2575d267f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,7 +2,6 @@ pipeline { agent { docker { image 'artempikulin/cmake-ubuntu' - args '-v .:/home/SuperNET -w /home/SuperNET' } } From de48a33d07b1a7b8cc98a1804c3c57e1a235a75d Mon Sep 17 00:00:00 2001 From: Artem Pikulin Date: Fri, 23 Mar 2018 12:32:47 +0300 Subject: [PATCH 04/15] Added Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2575d267f..bf8073184 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ pipeline { stages { stage('Build') { steps { - build 'Cmake' + sh 'docker run -v .:/home/SuperNET -w /home/SuperNET --rm artempikulin/cmake-ubuntu' } } } From b2b8eb604170b7d3abad27513793027a3eedd8bc Mon Sep 17 00:00:00 2001 From: Artem Pikulin Date: Fri, 23 Mar 2018 12:39:06 +0300 Subject: [PATCH 05/15] Added Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index bf8073184..2787bc313 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ pipeline { stages { stage('Build') { steps { - sh 'docker run -v .:/home/SuperNET -w /home/SuperNET --rm artempikulin/cmake-ubuntu' + echo 'Success' } } } From f351473480f6d0e4b3556631ad6c0b27daffddc2 Mon Sep 17 00:00:00 2001 From: Artem Pikulin Date: Fri, 23 Mar 2018 12:50:22 +0300 Subject: [PATCH 08/15] Added Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2787bc313..bf8073184 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ pipeline { stages { stage('Build') { steps { - echo 'Success' + sh 'docker run -v .:/home/SuperNET -w /home/SuperNET --rm artempikulin/cmake-ubuntu' } } } From 96decc17560d8305e72aa12c2a827615f546e211 Mon Sep 17 00:00:00 2001 From: Artem Pikulin Date: Fri, 23 Mar 2018 12:55:47 +0300 Subject: [PATCH 09/15] Added Jenkinsfile --- Jenkinsfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index bf8073184..af97b1343 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,10 @@ pipeline { stages { stage('Build') { steps { - sh 'docker run -v .:/home/SuperNET -w /home/SuperNET --rm artempikulin/cmake-ubuntu' + sh '''mkdir build +cd build +cmake .. +cmake --build . --target marketmaker-testnet''' } } } From 73167c4cc4972b0e7bdf80d13f96b2d43e5effb9 Mon Sep 17 00:00:00 2001 From: Artem Pikulin Date: Fri, 23 Mar 2018 12:57:28 +0300 Subject: [PATCH 10/15] Added Jenkinsfile --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index af97b1343..b12430f78 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,8 @@ pipeline { stages { stage('Build') { steps { - sh '''mkdir build + sh '''rm -rf build +mkdir build cd build cmake .. cmake --build . --target marketmaker-testnet''' From 5fbc18f84a9efdb6999f7a90fe22149a72ca557a Mon Sep 17 00:00:00 2001 From: Artem Pikulin Date: Fri, 23 Mar 2018 12:59:51 +0300 Subject: [PATCH 11/15] Added Jenkinsfile --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index b12430f78..f7bb536b0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,8 @@ pipeline { stages { stage('Build') { steps { - sh '''rm -rf build + sh '''git submodule update --init --recursive +rm -rf build mkdir build cd build cmake .. From 6887732a65bbd281d6a1bc0305a038081d853956 Mon Sep 17 00:00:00 2001 From: Artem Pikulin Date: Fri, 23 Mar 2018 13:41:17 +0300 Subject: [PATCH 12/15] Added Jenkinsfile --- Jenkinsfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f7bb536b0..f8e52fb9d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,10 +1,5 @@ pipeline { - agent { - docker { - image 'artempikulin/cmake-ubuntu' - } - - } + agent none stages { stage('Build') { steps { From 321152cb74e7d63e57c24f95b4ac6187b8b335ce Mon Sep 17 00:00:00 2001 From: Artem Pikulin Date: Fri, 23 Mar 2018 13:42:16 +0300 Subject: [PATCH 13/15] Added Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index f8e52fb9d..e3dc5323c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,5 @@ pipeline { - agent none + agent any stages { stage('Build') { steps { From 984ccb533afce232a9e8d0e7a3d2ebc3577e073a Mon Sep 17 00:00:00 2001 From: Artem Pikulin Date: Fri, 23 Mar 2018 13:43:13 +0300 Subject: [PATCH 14/15] Added Jenkinsfile --- Jenkinsfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e3dc5323c..f7bb536b0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,10 @@ pipeline { - agent any + agent { + docker { + image 'artempikulin/cmake-ubuntu' + } + + } stages { stage('Build') { steps { From 11258b018d35071d1fbfc592113020a0a3b9b611 Mon Sep 17 00:00:00 2001 From: Artem Pikulin Date: Tue, 27 Mar 2018 18:40:19 +0700 Subject: [PATCH 15/15] Don't search and link for system installed nanomsg. Use static only. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 173fb54da..d75ce3e87 100644 --- a/CMakeLists.txt +++ b/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)