Merge branch 'develop' into 'master'

Develop See merge request in3/c/in3-core!180
blockchainsllc · Mar 10, 2020 · 071573b · 071573b
2 parents 684fbce + 169780b
commit 071573b
Show file tree

Hide file tree

Showing 267 changed files with 4,376 additions and 2,631 deletions.
diff --git a/.clang-format b/.clang-format
@@ -2,6 +2,9 @@ BasedOnStyle: LLVM
 AlignConsecutiveAssignments: true
 AlignConsecutiveDeclarations: true
 AlignTrailingComments: true
+AlignAfterOpenBracket: Align
+AlignEscapedNewlines: Right
+AlignOperands: true
 AllowShortBlocksOnASingleLine: true
 AllowShortCaseLabelsOnASingleLine: true
 AllowShortFunctionsOnASingleLine: All

diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,7 @@ _build
 **/.vscode/ipch/
 **/.DS_Store
 /.metadata/
+/build.gradle
 .DS_Store
 /RemoteSystemsTempFiles/
 cmake-build-debug/

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -4,6 +4,13 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+        {
+            "type": "java",
+            "name": "Debug (Attach)",
+            "request": "attach",
+            "hostName": "localhost",
+            "port": "5005"
+        },
         {
             "type": "lldb",
             "request": "launch",

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@
 # This file is part of the Incubed project.
 # Sources: https://github.com/slockit/in3-c
 # 
-# Copyright (C) 2018-2019 slock.it GmbH, Blockchains LLC
+# Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
 # 
 # 
 # COMMERCIAL LICENSE USAGE
@@ -45,6 +45,7 @@ option(ETH_NANO "build minimal eth verification.(eth_getTransactionReceipt)" ON)
 option(ETH_BASIC "build basic eth verification.(all rpc-calls except eth_call)" ON)
 option(ETH_FULL "build full eth verification.(including eth_call)" ON)
 option(IPFS "build IPFS verification" ON)
+option(COLOR "Enable color codes for debug" ON)
 option(BTC "if true, the bitcoin verifiers will be build" OFF)
 option(IN3API "build the USN-API which offer better interfaces and additional functions on top of the pure verification" ON)
 option(USE_PRECOMPUTED_EC "if true the secp256k1 curve uses precompiled tables to boost performance. turning this off makes ecrecover slower, but saves about 37kb." ON)
@@ -99,6 +100,11 @@ if(IPFS)
   set(IN3_VERIFIER ${IN3_VERIFIER} ipfs)
 endif()
 
+if(COLOR AND NOT (MSVC OR MSYS OR MINGW))
+   ADD_DEFINITIONS(-DLOG_USE_COLOR)
+endif()
+
+
 if(CMAKE_BUILD_TYPE MATCHES Debug)
     ADD_DEFINITIONS(-DDEBUG)
 endif(CMAKE_BUILD_TYPE MATCHES Debug)
@@ -150,7 +156,6 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 if(TEST)
     MESSAGE(STATUS "Build Tests and add debug infos")
     ADD_DEFINITIONS(-DTEST)
-    ADD_DEFINITIONS(-DLOG_USE_COLOR)
     ADD_DEFINITIONS(-DIN3_DONT_HASH_KEYS)
     ADD_DEFINITIONS(-DIN3_EXPORT_TEST=)
     ADD_DEFINITIONS(-DIN3_IMPORT_TEST=extern)
@@ -159,6 +164,7 @@ if(TEST)
     enable_testing()
     add_subdirectory(c/test)
     add_custom_target(ptest COMMAND ${CMAKE_CTEST_COMMAND} -j 8)
+    add_custom_target(rtest COMMAND ${CMAKE_CTEST_COMMAND} -V )
 endif(TEST)
 
 

diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,7 @@
 # This file is part of the Incubed project.
 # Sources: https://github.com/slockit/in3-c
 # 
-# Copyright (C) 2018-2019 slock.it GmbH, Blockchains LLC
+# Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
 # 
 # 
 # COMMERCIAL LICENSE USAGE

diff --git a/c/CMakeLists.txt b/c/CMakeLists.txt
@@ -2,7 +2,7 @@
 # This file is part of the Incubed project.
 # Sources: https://github.com/slockit/in3-c
 # 
-# Copyright (C) 2018-2019 slock.it GmbH, Blockchains LLC
+# Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
 # 
 # 
 # COMMERCIAL LICENSE USAGE
@@ -41,10 +41,13 @@ add_subdirectory(src/core)
 add_subdirectory(src/transport)
 add_subdirectory(src/verifier)
 add_subdirectory(src/api)
-add_subdirectory(src/cmd)
+IF (ETH_FULL)
+    add_subdirectory(src/cmd)
+endif()
 add_subdirectory(docs)
 
 
+
 # create the library
 if (IN3_LIB)
     set(IN3_LIBS

diff --git a/c/compiler.cmake b/c/compiler.cmake
@@ -3,7 +3,11 @@ if(MSVC)
   set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall -funsigned-char  -std=c99 -D__FILENAME__=none")
 else(MSVC)
   set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -Wall -funsigned-char -Wextra -std=c99")
-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall -funsigned-char -Wextra  -std=c99 -D__FILENAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'")
+  if (NOT DEFINED ANDROID_ABI)
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall -funsigned-char -Wextra  -std=c99 -D__FILENAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'")
+  else()
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall -funsigned-char -Wextra  -std=c99 -D__FILENAME__=none")
+  endif()
 endif(MSVC)
 if (WASM)
   set (CMAKE_C_FLAGS "-Wall -funsigned-char -Wextra -std=c99")

diff --git a/c/include/in3/api_utils.h b/c/include/in3/api_utils.h
@@ -2,7 +2,7 @@
  * This file is part of the Incubed project.
  * Sources: https://github.com/slockit/in3-c
  *
- * Copyright (C) 2018-2019 slock.it GmbH, Blockchains LLC
+ * Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
  *
  *
  * COMMERCIAL LICENSE USAGE

diff --git a/c/include/in3/bytes.h b/c/include/in3/bytes.h
@@ -2,7 +2,7 @@
  * This file is part of the Incubed project.
  * Sources: https://github.com/slockit/in3-c
  * 
- * Copyright (C) 2018-2019 slock.it GmbH, Blockchains LLC
+ * Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
  * 
  * 
  * COMMERCIAL LICENSE USAGE

diff --git a/c/include/in3/chainspec.h b/c/include/in3/chainspec.h
@@ -2,7 +2,7 @@
  * This file is part of the Incubed project.
  * Sources: https://github.com/slockit/in3-c
  * 
- * Copyright (C) 2018-2019 slock.it GmbH, Blockchains LLC
+ * Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
  * 
  * 
  * COMMERCIAL LICENSE USAGE

diff --git a/c/include/in3/client.h b/c/include/in3/client.h
@@ -2,7 +2,7 @@
  * This file is part of the Incubed project.
  * Sources: https://github.com/slockit/in3-c
  * 
- * Copyright (C) 2018-2019 slock.it GmbH, Blockchains LLC
+ * Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
  * 
  * 
  * COMMERCIAL LICENSE USAGE

diff --git a/c/include/in3/context.h b/c/include/in3/context.h
@@ -2,7 +2,7 @@
  * This file is part of the Incubed project.
  * Sources: https://github.com/slockit/in3-c
  * 
- * Copyright (C) 2018-2019 slock.it GmbH, Blockchains LLC
+ * Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
  * 
  * 
  * COMMERCIAL LICENSE USAGE
@@ -38,11 +38,11 @@
  * This is used for each request holding request and response-pointers but also controls the execution process.
  * */
 
+#include "client.h"
 #include "data.h"
 #include "scache.h"
 #include "stringbuilder.h"
 #include "utils.h"
-#include "client.h"
 #include <stdbool.h>
 #include <stdint.h>
 #ifndef CONTEXT_H

diff --git a/c/include/in3/data.h b/c/include/in3/data.h
@@ -2,7 +2,7 @@
  * This file is part of the Incubed project.
  * Sources: https://github.com/slockit/in3-c
  * 
- * Copyright (C) 2018-2019 slock.it GmbH, Blockchains LLC
+ * Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
  * 
  * 
  * COMMERCIAL LICENSE USAGE

diff --git a/c/include/in3/error.h b/c/include/in3/error.h
@@ -2,7 +2,7 @@
  * This file is part of the Incubed project.
  * Sources: https://github.com/slockit/in3-c
  * 
- * Copyright (C) 2018-2019 slock.it GmbH, Blockchains LLC
+ * Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
  * 
  * 
  * COMMERCIAL LICENSE USAGE

diff --git a/c/include/in3/eth_api.h b/c/include/in3/eth_api.h
@@ -2,7 +2,7 @@
  * This file is part of the Incubed project.
  * Sources: https://github.com/slockit/in3-c
  * 
- * Copyright (C) 2018-2019 slock.it GmbH, Blockchains LLC
+ * Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
  * 
  * 
  * COMMERCIAL LICENSE USAGE
@@ -42,8 +42,8 @@
 #ifndef ETH_API_H
 #define ETH_API_H
 
-#include "client.h"
 #include "api_utils.h"
+#include "client.h"
 #include <stdarg.h>
 
 /** Initializer macros for eth_blknum_t */

diff --git a/c/include/in3/eth_basic.h b/c/include/in3/eth_basic.h
@@ -2,7 +2,7 @@
  * This file is part of the Incubed project.
  * Sources: https://github.com/slockit/in3-c
  * 
- * Copyright (C) 2018-2019 slock.it GmbH, Blockchains LLC
+ * Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
  * 
  * 
  * COMMERCIAL LICENSE USAGE

diff --git a/c/include/in3/eth_full.h b/c/include/in3/eth_full.h
@@ -2,7 +2,7 @@
  * This file is part of the Incubed project.
  * Sources: https://github.com/slockit/in3-c
  * 
- * Copyright (C) 2018-2019 slock.it GmbH, Blockchains LLC
+ * Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
  * 
  * 
  * COMMERCIAL LICENSE USAGE

diff --git a/c/include/in3/eth_nano.h b/c/include/in3/eth_nano.h
@@ -2,7 +2,7 @@
  * This file is part of the Incubed project.
  * Sources: https://github.com/slockit/in3-c
  * 
- * Copyright (C) 2018-2019 slock.it GmbH, Blockchains LLC
+ * Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
  * 
  * 
  * COMMERCIAL LICENSE USAGE

diff --git a/c/include/in3/in3_curl.h b/c/include/in3/in3_curl.h
@@ -2,7 +2,7 @@
  * This file is part of the Incubed project.
  * Sources: https://github.com/slockit/in3-c
  * 
- * Copyright (C) 2018-2019 slock.it GmbH, Blockchains LLC
+ * Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
  * 
  * 
  * COMMERCIAL LICENSE USAGE

diff --git a/c/include/in3/in3_http.h b/c/include/in3/in3_http.h
@@ -2,7 +2,7 @@
  * This file is part of the Incubed project.
  * Sources: https://github.com/slockit/in3-c
  * 
- * Copyright (C) 2018-2019 slock.it GmbH, Blockchains LLC
+ * Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
  * 
  * 
  * COMMERCIAL LICENSE USAGE

diff --git a/c/include/in3/ipfs.h b/c/include/in3/ipfs.h
@@ -2,7 +2,7 @@
  * This file is part of the Incubed project.
  * Sources: https://github.com/slockit/in3-c
  *
- * Copyright (C) 2018-2019 slock.it GmbH, Blockchains LLC
+ * Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
  *
  *
  * COMMERCIAL LICENSE USAGE

diff --git a/c/include/in3/ipfs_api.h b/c/include/in3/ipfs_api.h
@@ -2,7 +2,7 @@
  * This file is part of the Incubed project.
  * Sources: https://github.com/slockit/in3-c
  *
- * Copyright (C) 2018-2019 slock.it GmbH, Blockchains LLC
+ * Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
  *
  *
  * COMMERCIAL LICENSE USAGE
@@ -42,8 +42,8 @@
 #ifndef IN3_IPFS_API_H
 #define IN3_IPFS_API_H
 
-#include "client.h"
 #include "bytes.h"
+#include "client.h"
 
 char*    ipfs_put(in3_t* in3, const bytes_t* content); /**< Returns the IPFS multihash of stored content on success OR NULL on error (check api_last_error()). Result must be freed by caller. */
 bytes_t* ipfs_get(in3_t* in3, const char* multihash);  /**< Returns the content associated with specified multihash on success OR NULL on error (check api_last_error()). Result must be freed by caller. */

diff --git a/c/include/in3/rpc.h b/c/include/in3/rpc.h
@@ -2,7 +2,7 @@
  * This file is part of the Incubed project.
  * Sources: https://github.com/slockit/in3-c
  * 
- * Copyright (C) 2018-2019 slock.it GmbH, Blockchains LLC
+ * Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
  * 
  * 
  * COMMERCIAL LICENSE USAGE

diff --git a/c/include/in3/scache.h b/c/include/in3/scache.h
@@ -2,7 +2,7 @@
  * This file is part of the Incubed project.
  * Sources: https://github.com/slockit/in3-c
  * 
- * Copyright (C) 2018-2019 slock.it GmbH, Blockchains LLC
+ * Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
  * 
  * 
  * COMMERCIAL LICENSE USAGE

diff --git a/c/include/in3/signer.h b/c/include/in3/signer.h
@@ -2,7 +2,7 @@
  * This file is part of the Incubed project.
  * Sources: https://github.com/slockit/in3-c
  * 
- * Copyright (C) 2018-2019 slock.it GmbH, Blockchains LLC
+ * Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
  * 
  * 
  * COMMERCIAL LICENSE USAGE

diff --git a/c/include/in3/stringbuilder.h b/c/include/in3/stringbuilder.h
@@ -2,7 +2,7 @@
  * This file is part of the Incubed project.
  * Sources: https://github.com/slockit/in3-c
  * 
- * Copyright (C) 2018-2019 slock.it GmbH, Blockchains LLC
+ * Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
  * 
  * 
  * COMMERCIAL LICENSE USAGE

diff --git a/c/include/in3/usn_api.h b/c/include/in3/usn_api.h
@@ -2,7 +2,7 @@
  * This file is part of the Incubed project.
  * Sources: https://github.com/slockit/in3-c
  * 
- * Copyright (C) 2018-2019 slock.it GmbH, Blockchains LLC
+ * Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
  * 
  * 
  * COMMERCIAL LICENSE USAGE

diff --git a/c/include/in3/utils.h b/c/include/in3/utils.h
@@ -2,7 +2,7 @@
  * This file is part of the Incubed project.
  * Sources: https://github.com/slockit/in3-c
  * 
- * Copyright (C) 2018-2019 slock.it GmbH, Blockchains LLC
+ * Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
  * 
  * 
  * COMMERCIAL LICENSE USAGE

diff --git a/c/include/in3/verifier.h b/c/include/in3/verifier.h
@@ -2,7 +2,7 @@
  * This file is part of the Incubed project.
  * Sources: https://github.com/slockit/in3-c
  * 
- * Copyright (C) 2018-2019 slock.it GmbH, Blockchains LLC
+ * Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
  * 
  * 
  * COMMERCIAL LICENSE USAGE
@@ -38,11 +38,11 @@
  * This context is passed to the verifier.
  * */
 
+#include "client.h"
+#include "context.h"
 #include "data.h"
 #include "stringbuilder.h"
 #include "utils.h"
-#include "client.h"
-#include "context.h"
 #include <stdbool.h>
 #include <stdint.h>
 

diff --git a/c/src/api/CMakeLists.txt b/c/src/api/CMakeLists.txt
@@ -2,7 +2,7 @@
 # This file is part of the Incubed project.
 # Sources: https://github.com/slockit/in3-c
 # 
-# Copyright (C) 2018-2019 slock.it GmbH, Blockchains LLC
+# Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
 # 
 # 
 # COMMERCIAL LICENSE USAGE

diff --git a/c/src/api/eth1/CMakeLists.txt b/c/src/api/eth1/CMakeLists.txt
@@ -2,7 +2,7 @@
 # This file is part of the Incubed project.
 # Sources: https://github.com/slockit/in3-c
 # 
-# Copyright (C) 2018-2019 slock.it GmbH, Blockchains LLC
+# Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
 # 
 # 
 # COMMERCIAL LICENSE USAGE

diff --git a/c/src/api/eth1/abi.c b/c/src/api/eth1/abi.c
@@ -2,7 +2,7 @@
  * This file is part of the Incubed project.
  * Sources: https://github.com/slockit/in3
  * 
- * Copyright (C) 2018-2019 slock.it GmbH, Blockchains LLC
+ * Copyright (C) 2018-2020 slock.it GmbH, Blockchains LLC
  * 
  * 
  * COMMERCIAL LICENSE USAGE