Zilliqa · n-hutton · Jul 29, 2022 · Jun 24, 2022 · Jun 24, 2022 · Jun 28, 2022
diff --git a/.gitignore b/.gitignore
@@ -96,3 +96,12 @@ compile_commands.json
 .vscode
 .history
 cmake-build-debug
+
+# Files from running isolated server
+persistence/
+scilla/
+scilla_files/
+evm-ds/
+config.xml
+isolated-server-accounts.json
+isolated-server.logs
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -45,6 +45,8 @@ find_package(g3logger CONFIG REQUIRED)
 
 include(InstallCryptoUtils)
 
+include(ProjectSecp256k1)
+
 include(InstallMongo)
 find_package(mongocxx CONFIG REQUIRED)
 

diff --git a/README.md b/README.md
@@ -106,6 +106,7 @@ export PATH=$HOME/.local/bin:$PATH
 cmake --version
 rm cmake-3.19.3-Linux-x86_64.sh
 ```
+
 ### Additional Requirements for Contributors
 
 If you intend to contribute to the code base, please perform these additional steps:
@@ -168,7 +169,7 @@ The Zilliqa client works together with Scilla for executing smart contracts. Ple
     $ cd build && ./tests/Node/pre_run.sh && ./tests/Node/test_node_lookup.sh && ./tests/Node/test_node_simple.sh
     ```
 
-2. Logs of each node can be found at `./local_run`.
+2. Logs of each node can be found at `./local_run`
 
 3. To terminate Zilliqa:
 

diff --git a/cmake/ProjectSecp256k1.cmake b/cmake/ProjectSecp256k1.cmake
@@ -0,0 +1,39 @@
+include(ExternalProject)
+
+if (MSVC)
+    set(_only_release_configuration -DCMAKE_CONFIGURATION_TYPES=Release)
+    set(_overwrite_install_command INSTALL_COMMAND cmake --build <BINARY_DIR> --config Release --target install)
+endif()
+
+set(prefix "${CMAKE_BINARY_DIR}/deps")
+set(SECP256K1_LIBRARY "${prefix}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}secp256k1${CMAKE_STATIC_LIBRARY_SUFFIX}")
+set(SECP256K1_INCLUDE_DIR "${prefix}/include")
+
+ExternalProject_Add(
+    secp256k1
+    PREFIX "${prefix}"
+    DOWNLOAD_NAME secp256k1-ac8ccf29.tar.gz
+    DOWNLOAD_NO_PROGRESS 1
+    URL https://github.com/chfast/secp256k1/archive/ac8ccf29b8c6b2b793bc734661ce43d1f952977a.tar.gz
+    URL_HASH SHA256=02f8f05c9e9d2badc91be8e229a07ad5e4984c1e77193d6b00e549df129e7c3a
+    PATCH_COMMAND ${CMAKE_COMMAND} -E copy_if_different
+        ${CMAKE_CURRENT_LIST_DIR}/secp256k1/CMakeLists.txt <SOURCE_DIR>
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
+               -DCMAKE_POSITION_INDEPENDENT_CODE=${BUILD_SHARED_LIBS}
+               -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+               -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+               ${_only_release_configuration}
+    LOG_CONFIGURE 1
+    BUILD_COMMAND ""
+    ${_overwrite_install_command}
+    LOG_INSTALL 1
+    BUILD_BYPRODUCTS "${SECP256K1_LIBRARY}"
+)
+
+# Create imported library
+add_library(Secp256k1 STATIC IMPORTED)
+file(MAKE_DIRECTORY "${SECP256K1_INCLUDE_DIR}")  # Must exist.
+set_property(TARGET Secp256k1 PROPERTY IMPORTED_CONFIGURATIONS Release)
+set_property(TARGET Secp256k1 PROPERTY IMPORTED_LOCATION_RELEASE "${SECP256K1_LIBRARY}")
+set_property(TARGET Secp256k1 PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${SECP256K1_INCLUDE_DIR}")
+add_dependencies(Secp256k1 secp256k1)
diff --git a/cmake/secp256k1/CMakeLists.txt b/cmake/secp256k1/CMakeLists.txt
@@ -0,0 +1,38 @@
+# This CMake config file for secp256k1 project from https://github.com/bitcoin-core/secp256k1
+#
+# The secp256k1 project has been configured following official docs with following options:
+#
+# ./configure --disable-shared --disable-tests --disable-coverage --disable-openssl-tests --disable-exhaustive-tests --disable-jni --with-bignum=no --with-field=64bit --with-scalar=64bit --with-asm=no
+#
+# Build static context:
+# make src/ecmult_static_context.h
+#
+# Copy src/ecmult_static_context.h and src/libsecp256k1-config.h
+#
+# Copy CFLAGS from Makefile to COMPILE_OPTIONS.
+
+cmake_minimum_required(VERSION 3.4)
+project(secp256k1 LANGUAGES C)
+
+set(COMMON_COMPILE_FLAGS ENABLE_MODULE_RECOVERY ENABLE_MODULE_ECDH USE_ECMULT_STATIC_PRECOMPUTATION USE_FIELD_INV_BUILTIN USE_NUM_NONE USE_SCALAR_INV_BUILTIN)
+if (MSVC)
+	set(COMPILE_FLAGS USE_FIELD_10X26 USE_SCALAR_8X32)
+	set(COMPILE_OPTIONS "")
+else()
+	set(COMPILE_FLAGS USE_FIELD_5X52 USE_SCALAR_4X64 HAVE_BUILTIN_EXPECT HAVE___INT128)
+	set(COMPILE_OPTIONS -O3 -W -std=c89 -pedantic -Wall -Wextra -Wcast-align -Wnested-externs -Wshadow -Wstrict-prototypes -Wno-unused-function -Wno-long-long -Wno-overlength-strings -fvisibility=hidden)
+endif()
+
+add_executable(gen_context src/gen_context.c)
+target_include_directories(gen_context PRIVATE ${CMAKE_SOURCE_DIR})
+
+add_custom_target(ecmult_static_context gen_context WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+
+add_library(secp256k1 STATIC src/secp256k1.c)
+target_compile_definitions(secp256k1 PRIVATE ${COMMON_COMPILE_FLAGS} ${COMPILE_FLAGS})
+target_include_directories(secp256k1 PRIVATE ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src)
+target_compile_options(secp256k1 PRIVATE ${COMPILE_OPTIONS})
+add_dependencies(secp256k1 ecmult_static_context)
+
+install(TARGETS secp256k1 ARCHIVE DESTINATION lib)
+install(DIRECTORY include/ DESTINATION include)
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -98,39 +98,39 @@ ARG BUILD_TYPE=RelWithDebInfo
 ARG EXTRA_CMAKE_ARGS=
 ARG MONGO_INSTALL_DIR=${BUILD_DIR}/mongo
 
-RUN git clone ${REPO} ${SOURCE_DIR} \
-    && git -C ${SOURCE_DIR} checkout ${COMMIT_OR_TAG} \
-    && cmake -H${SOURCE_DIR} -B${BUILD_DIR} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
-    -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} ${EXTRA_CMAKE_ARGS} \
-    && cmake --build ${BUILD_DIR} -- -j$(nproc) \
-    && cmake --build ${BUILD_DIR} --target install \
-    && echo "built files:" && ls -lh ${BUILD_DIR} && echo "installed libs:" && ls -lh ${INSTALL_DIR}/lib \
-    && echo "mongo files:" && ls -lh ${MONGO_INSTALL_DIR}/lib \
-    # strip all exes
-    && strip /usr/local/bin/grepperf \
-       /usr/local/bin/zilliqad \
-       /usr/local/bin/genkeypair \
-       /usr/local/bin/signmultisig \
-       /usr/local/bin/verifymultisig \
-       /usr/local/bin/getpub \
-       /usr/local/bin/getaddr \
-       /usr/local/bin/genaccounts \
-       /usr/local/bin/sendcmd \
-       /usr/local/bin/gentxn \
-       /usr/local/bin/restore \
-       /usr/local/bin/gensigninitialds \
-       /usr/local/bin/validateDB \
-       /usr/local/bin/genTxnBodiesFromS3 \
-       /usr/local/bin/getnetworkhistory \
-       /usr/local/bin/isolatedServer \
-       /usr/local/bin/getrewardhistory \
-    #    /usr/local/bin/zilliqa \
-       /usr/local/bin/data_migrate \
-       /usr/local/lib/libSchnorr.so \
-       /usr/local/lib/libCryptoUtils.so \
-       /usr/local/lib/libNAT.so \
-       /usr/local/lib/libCommon.so \
-       /usr/local/lib/libTrie.so
+RUN git clone ${REPO} ${SOURCE_DIR}
+RUN git -C ${SOURCE_DIR} checkout ${COMMIT_OR_TAG}
+RUN cmake -H${SOURCE_DIR} -B${BUILD_DIR} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} ${EXTRA_CMAKE_ARGS}
+RUN cmake --build ${BUILD_DIR} -- -j$(nproc)
+RUN cmake --build ${BUILD_DIR} --target install
+RUN echo "built files:" && ls -lh ${BUILD_DIR} && echo "installed libs:" && ls -lh ${INSTALL_DIR}/lib
+RUN echo "mongo files:" && ls -lh ${MONGO_INSTALL_DIR}/lib
+
+# strip all exes
+RUN strip /usr/local/bin/grepperf \
+   /usr/local/bin/zilliqad \
+   /usr/local/bin/genkeypair \
+   /usr/local/bin/signmultisig \
+   /usr/local/bin/verifymultisig \
+   /usr/local/bin/getpub \
+   /usr/local/bin/getaddr \
+   /usr/local/bin/genaccounts \
+   /usr/local/bin/sendcmd \
+   /usr/local/bin/gentxn \
+   /usr/local/bin/restore \
+   /usr/local/bin/gensigninitialds \
+   /usr/local/bin/validateDB \
+   /usr/local/bin/genTxnBodiesFromS3 \
+   /usr/local/bin/getnetworkhistory \
+   /usr/local/bin/isolatedServer \
+   /usr/local/bin/getrewardhistory \
+#    /usr/local/bin/zilliqa \
+   /usr/local/bin/data_migrate \
+   /usr/local/lib/libSchnorr.so \
+   /usr/local/lib/libCryptoUtils.so \
+   /usr/local/lib/libNAT.so \
+   /usr/local/lib/libCommon.so \
+   /usr/local/lib/libTrie.so
 
 # start from a new ubuntu as the runner image
 FROM ubuntu:18.04
@@ -182,7 +182,7 @@ RUN pip3 install wheel \
     && pip3 install --no-cache-dir -r requirements3.txt \
     && update-alternatives --install /usr/bin/python python /usr/bin/python3 10 # set python3 as default instead python2
 
-# make dirs fro scilla and zilliqa
+# make dirs for scilla and zilliqa
 RUN mkdir -p \
     /scilla/0/bin /scilla/0/src/stdlib \
     /zilliqa/scripts

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -6,6 +6,7 @@ add_subdirectory (libConsensus)
 add_subdirectory (libCrypto)
 add_subdirectory (libData)
 add_subdirectory (libDirectoryService)
+add_subdirectory (libEth)
 add_subdirectory (libLookup)
 add_subdirectory (libMediator)
 add_subdirectory (libMessage)

diff --git a/src/common/Constants.cpp b/src/common/Constants.cpp
@@ -49,9 +49,15 @@ double ReadConstantDouble(const string& propertyName,
 }
 
 string ReadConstantString(const string& propertyName,
-                          const char* path = "node.general.") {
+                          const char* path = "node.general.",
+                          const char* defaultVal = "defaulted") {
   auto pt = PTree::GetInstance();
-  return pt.get<string>(path + propertyName);
+
+  try {
+    return pt.get<string>(path + propertyName);
+  } catch (exception e) {
+    return defaultVal;
+  }
 }
 
 uint64_t ReadConstantUInt64(const string& propertyName,
@@ -130,6 +136,8 @@ const unsigned int MSG_VERSION{
     ReadConstantNumeric("MSG_VERSION", "node.version.")};
 const unsigned int TRANSACTION_VERSION{
     ReadConstantNumeric("TRANSACTION_VERSION", "node.version.")};
+const unsigned int TRANSACTION_VERSION_ETH{
+    ReadConstantNumeric("TRANSACTION_VERSION", "node.version.") + 1};
 const unsigned int DSBLOCK_VERSION{
     ReadConstantNumeric("DSBLOCK_VERSION", "node.version.")};
 const unsigned int TXBLOCK_VERSION{
@@ -736,7 +744,9 @@ const std::string EVM_SERVER_SOCKET_PATH{
     ReadConstantString("EVM_SERVER_SOCKET_PATH", "node.jsonrpc.")};
 const std::string EVM_SERVER_BINARY{
     ReadConstantString("EVM_SERVER_BINARY", "node.jsonrpc.")};
-const std::string EVM_LOG_CONFIG{
-    ReadConstantString("EVM_LOG_CONFIG", "node.jsonrpc.")};
+const std::string EVM_LOG_CONFIG{ReadConstantString(
+    "EVM_LOG_CONFIG", "node.jsonrpc.", "/usr/local/etc/log4rs.yml")};
 const std::string ETH_CHAINID{
     ReadConstantString("ETH_CHAINID", "node.jsonrpc.")};
+const uint64_t ETH_CHAINID_INT{DataConversion::HexStringToUint64Ret(
+    ReadConstantString("ETH_CHAINID", "node.jsonrpc."))};
diff --git a/src/common/Constants.h b/src/common/Constants.h
@@ -163,6 +163,7 @@ extern const uint64_t INIT_TRIE_DB_SNAPSHOT_EPOCH;
 // Version constants
 extern const unsigned int MSG_VERSION;
 extern const unsigned int TRANSACTION_VERSION;
+extern const unsigned int TRANSACTION_VERSION_ETH;
 extern const unsigned int DSBLOCK_VERSION;
 extern const unsigned int TXBLOCK_VERSION;
 extern const unsigned int MICROBLOCK_VERSION;
@@ -310,6 +311,7 @@ extern const std::string EVM_SERVER_SOCKET_PATH;
 extern const std::string EVM_SERVER_BINARY;
 extern const std::string EVM_LOG_CONFIG;
 extern const std::string ETH_CHAINID;
+extern const uint64_t ETH_CHAINID_INT;
 
 extern const std::string IP_TO_BIND;  // Only for non-lookup nodes
 extern const bool ENABLE_STAKING_RPC;

diff --git a/src/depends/Schnorr b/src/depends/Schnorr
diff --git a/src/libCrypto/CMakeLists.txt b/src/libCrypto/CMakeLists.txt
@@ -1,2 +1,3 @@
 add_library(EthCrypto EthCrypto.cpp)
 target_include_directories(EthCrypto PUBLIC ${PROJECT_SOURCE_DIR}/src)
+target_link_libraries(EthCrypto Secp256k1)
+0 −6		src/libSchnorr/src/MultiSig_CommitPointHash.cpp
+1 −1		src/libSchnorr/src/Schnorr_PubKey.cpp