Skip to content

Commit

Permalink
ready
Browse files Browse the repository at this point in the history
  • Loading branch information
lopu committed Aug 14, 2018
1 parent 7a9181c commit 74e4386
Show file tree
Hide file tree
Showing 229 changed files with 9,176 additions and 313 deletions.
2 changes: 1 addition & 1 deletion .gitbackup
Original file line number Diff line number Diff line change
@@ -1 +1 @@
gitdir: /home/lopu/git/ezira-node/master/.git/worktrees/stable-dev
gitdir: /home/lopu/git/eznode/master/.git/worktrees/stable-dev
2 changes: 1 addition & 1 deletion .metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<section name="Workbench">
<section name="org.eclipse.ui.internal.ide.dialogs.ProjectContentsLocationArea">
<item value="/Users/lopu/Sync/git/ezira-node" key="OUTSIDE_LOCATION"/>
<item value="/Users/lopu/Sync/git/eznode" key="OUTSIDE_LOCATION"/>
</section>
</section>
36 changes: 18 additions & 18 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Defines Ezira library target.
project( Ezira )
# Defines Eznode library target.
project( Eznode )
cmake_minimum_required( VERSION 3.2 )

set( BLOCKCHAIN_NAME "Ezira" )

set( GUI_CLIENT_EXECUTABLE_NAME Ezira )
set( GUI_CLIENT_EXECUTABLE_NAME Eznode )
set( CUSTOM_URL_SCHEME "gcs" )
set( INSTALLER_APP_ID "68ad7005-8eee-49c9-95ce-9eed97e5b347" )

Expand Down Expand Up @@ -108,7 +108,7 @@ FIND_PACKAGE(Boost 1.58 REQUIRED COMPONENTS ${BOOST_COMPONENTS})

if( WIN32 )

message( STATUS "Configuring Ezira on WIN32")
message( STATUS "Configuring Eznode on WIN32")
set( DB_VERSION 60 )
set( BDB_STATIC_LIBS 1 )

Expand Down Expand Up @@ -162,11 +162,11 @@ else( WIN32 ) # Apple AND Linux

if( APPLE )
# Apple Specific Options Here
message( STATUS "Configuring Ezira on OS X" )
message( STATUS "Configuring Eznode on OS X" )
set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -std=c++11 -stdlib=libc++ -Wall -Wno-conversion -Wno-deprecated-declarations" )
else( APPLE )
# Linux Specific Options Here
message( STATUS "Configuring Ezira on Linux" )
message( STATUS "Configuring Eznode on Linux" )
set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -std=c++11 -Wall" )
set( rt_library rt )
set( pthread_library pthread)
Expand Down Expand Up @@ -198,7 +198,7 @@ else( WIN32 ) # Apple AND Linux

endif( WIN32 )

set(ENABLE_COVERAGE_TESTING FALSE CACHE BOOL "Build Ezira for code coverage analysis")
set(ENABLE_COVERAGE_TESTING FALSE CACHE BOOL "Build Eznode for code coverage analysis")

if(ENABLE_COVERAGE_TESTING)
SET(CMAKE_CXX_FLAGS "--coverage ${CMAKE_CXX_FLAGS}")
Expand All @@ -224,24 +224,24 @@ set(CPACK_OUTPUT_FILE_PREFIX ${CMAKE_BINARY_DIR}/packages)
set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install)

SET(CPACK_PACKAGE_DIRECTORY "${CMAKE_INSTALL_PREFIX}")
set(CPACK_PACKAGE_NAME "ezira")
set(CPACK_PACKAGE_NAME "Eznode")
set(CPACK_PACKAGE_VENDOR "Ezira Network.")
set(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}")
set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
set(CPACK_PACKAGE_DESCRIPTION "A client for the Ezira network")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A client for the Ezira network")
set(CPACK_PACKAGE_DESCRIPTION "Node software for the Ezira Network")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Node software for the Ezira Network")
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "Ezira ${CPACK_PACKAGE_VERSION}")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "Eznode ${CPACK_PACKAGE_VERSION}")

if(WIN32)
SET(CPACK_GENERATOR "ZIP;NSIS")
set(CPACK_PACKAGE_NAME "Ezira") # override above
set(CPACK_PACKAGE_NAME "Eznode") # override above
set(CPACK_NSIS_EXECUTABLES_DIRECTORY .)
set(CPACK_NSIS_PACKAGE_NAME "Ezira v${CPACK_PACKAGE_VERSION}")
set(CPACK_NSIS_PACKAGE_NAME "Eznode v${CPACK_PACKAGE_VERSION}")
set(CPACK_NSIS_DISPLAY_NAME "${CPACK_NSIS_PACKAGE_NAME}")
set(CPACK_NSIS_DEFINES " !define MUI_STARTMENUPAGE_DEFAULTFOLDER \\\"Ezira\\\"")
set(CPACK_NSIS_DEFINES " !define MUI_STARTMENUPAGE_DEFAULTFOLDER \\\"Eznode\\\"")
# it seems like windows zip files usually don't have a single directory inside them, unix tgz frequently do
SET(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0)

Expand All @@ -261,15 +261,15 @@ endif(LINUX)
endif(ENABLE_INSTALLER)

if( BUILD_TESTNET )
MESSAGE( STATUS "\n\n CONFIGURED FOR TEST NETWORK \n\n" )
MESSAGE( STATUS "\n\n CONFIGURING FOR TEST NETWORK \n\n" )
else()
MESSAGE( STATUS "\n\n CONFIGURED FOR EZIRA NETWORK \n\n" )
MESSAGE( STATUS "\n\n EZNODE READY \n\n" )
endif()

if( LOW_MEMORY_NODE )
MESSAGE( STATUS "\n\n CONFIGURED FOR LOW MEMORY NODE \n\n" )
MESSAGE( STATUS "\n\n CONFIGURING FOR LOW MEMORY NODE \n\n" )
else()
MESSAGE( STATUS "\n\n CONFIGURED FOR FULL NODE \n\n" )
MESSAGE( STATUS "\n\n CONFIGURING FOR FULL NODE \n\n" )
endif()


2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Please do a keyword search to see if there is already an existing issue before o

## Ezira.io vs. Ezira Blockchain

This issue tracker is only intended to track issues for the Ezira blockchain. If the issue is with the Ezira.io website, please open an issue in the [Ezira.io Repository](https://github.com/eziranetwork/ezirait.com/).
This issue tracker is only intended to track issues for the Ezira blockchain. If the issue is with the Ezira.io website, please open an issue in the [Ezira.io Repository](https://github.com/eziranetwork/ezapp/).

## Pull Requests

Expand Down
22 changes: 11 additions & 11 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# get an apt-get dependancies pre-loaded image from lopudesigns (one of the devs of ezira) docker
FROM lopudesigns/ezira-build-ready-image
# get an apt-get dependancies pre-loaded image from lopudesigns (one of the devs of eznode) docker
FROM lopudesigns/eznode-build-ready-image

#ARG BLOCKCHAIN=https://example.com/eznode-blockchain.tbz2

Expand Down Expand Up @@ -42,10 +42,10 @@ ENV LANG=en_US.UTF-8
# rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
# pip3 install gcovr

ADD . /usr/local/src/ezira
ADD . /usr/local/src/eznode

# RUN \
# cd /usr/local/src/ezira && \
# cd /usr/local/src/eznode && \
# git submodule update --init --recursive && \
# mkdir build && \
# cd build && \
Expand All @@ -59,14 +59,14 @@ ADD . /usr/local/src/ezira
# make -j$(nproc) chain_test test_fixed_string && \
# ./tests/chain_test && \
# ./programs/util/test_fixed_string && \
# cd /usr/local/src/ezira && \
# cd /usr/local/src/eznode && \
# doxygen && \
# programs/build_helpers/check_reflect.py && \
# programs/build_helpers/get_config_check.sh && \
# rm -rf /usr/local/src/ezira/build
# rm -rf /usr/local/src/eznode/build

# RUN \
# cd /usr/local/src/ezira && \
# cd /usr/local/src/eznode && \
# git submodule update --init --recursive && \
# mkdir build && \
# cd build && \
Expand All @@ -83,11 +83,11 @@ ADD . /usr/local/src/ezira
# ./tests/chain_test && \
# mkdir -p /var/cobertura && \
# gcovr --object-directory="../" --root=../ --xml-pretty --gcov-exclude=".*tests.*" --gcov-exclude=".*fc.*" --gcov-exclude=".*app*" --gcov-exclude=".*net*" --gcov-exclude=".*plugins*" --gcov-exclude=".*schema*" --gcov-exclude=".*time*" --gcov-exclude=".*utilities*" --gcov-exclude=".*wallet*" --gcov-exclude=".*programs*" --output="/var/cobertura/coverage.xml" && \
# cd /usr/local/src/ezira && \
# rm -rf /usr/local/src/ezira/build
# cd /usr/local/src/eznode && \
# rm -rf /usr/local/src/eznode/build

RUN \
cd /usr/local/src/ezira && \
cd /usr/local/src/eznode && \
git submodule update --init --recursive && \
# mkdir build && \
# cd build && \
Expand Down Expand Up @@ -126,7 +126,7 @@ RUN \
&& \
make -j$(nproc) && \
make install && \
rm -rf /usr/local/src/ezira
rm -rf /usr/local/src/eznode

# RUN \
# apt-get remove -y \
Expand Down
2 changes: 1 addition & 1 deletion ciscripts/buildfailure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ curl --silent -XPOST -H "Authorization: token $GITHUB_SECRET" https://api.github
\"state\": \"failure\",
\"target_url\": \"${BUILD_URL}\",
\"description\": \"JenkinsCI reports the build has failed!\",
\"context\": \"jenkins-ci-ezira\"
\"context\": \"jenkins-ci-eznetwork\"
}"
rm -rf $WORKSPACE/*
# make docker cleanup after itself and delete all exited containers
Expand Down
2 changes: 1 addition & 1 deletion ciscripts/buildpending.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ curl --silent -XPOST -H "Authorization: token $GITHUB_SECRET" https://api.github
\"state\": \"pending\",
\"target_url\": \"${BUILD_URL}\",
\"description\": \"The build is now pending in jenkinsci!\",
\"context\": \"jenkins-ci-ezira\"
\"context\": \"jenkins-ci-eznetwork\"
}"
2 changes: 1 addition & 1 deletion ciscripts/buildsuccess.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ curl --silent -XPOST -H "Authorization: token $GITHUB_SECRET" https://api.github
\"state\": \"success\",
\"target_url\": \"${BUILD_URL}\",
\"description\": \"Jenkins-CI reports build succeeded!!\",
\"context\": \"jenkins-ci-ezira\"
\"context\": \"jenkins-ci-eznetwork\"
}"
rm -rf $WORKSPACE/*
# make docker cleanup after itself and delete all exited containers
Expand Down
4 changes: 2 additions & 2 deletions doc/Python-Debug-Node.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ is a higher level language that many amateur and skilled programmers use. There
been community development of Python libraries to make interfacing with a live node easier.
This plugin closes the gap by allowing a node to be launched programmatically in Python
in addition to interfacing with the node. This module utilizes community member Xeroc's
[Python Ezira library](https://github.com/xeroc/python-eziralib).
[Python Ezira library](https://github.com/xeroc/python-eznetworklib).

How Do I Use This?
------------------
Expand All @@ -38,7 +38,7 @@ generates a historgram of block producers to verify the witness scheduling algor
properly. The purpose of the script is it verify any given hardfork does not have a bug that
could crash the chain entirely.

[debugnode.py](https://github.com/eziranetwork/ezira/python_scripts/eziradebugnode/debugnode.py#L212)
[debugnode.py](https://github.com/eziranetwork/ezira/python_scripts/eznodedebugnode/eznodedebugnode.py#L212)
This script is much simpler. It has the same parsing logic, but has much less test logic.
All it does is replay the blockchain, periodically printing a status update so the user
knows it is still working. The script then hangs so the user can interact with the chain
Expand Down
2 changes: 1 addition & 1 deletion doc/building.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Clears old votes from memory that are no longer required for consensus.

### BUILD_TESTNET=[OFF/ON]

Builds ezira for use in a private testnet. Also required for building unit tests.
Builds Eznode for use in a private testnet. Also required for building unit tests.

### SKIP_BY_TX_ID=[OFF/ON]

Expand Down
4 changes: 2 additions & 2 deletions doc/debug_node_plugin.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ The API's configured with `public-api` are assigned numbers starting at zero. S
API number 2 (TODO: Explain about resolving names to API's and get it working).

The API provides the following methods
(see `libraries/plugins/debug_node/include/ezira/plugins/debug_node/debug_node_api.hpp`
(see `libraries/plugins/debug_node/include/eznode/plugins/debug_node/debug_node_api.hpp`
for these definitions):

void debug_push_blocks( std::string src_filename, uint32_t count );
Expand Down Expand Up @@ -122,7 +122,7 @@ Now that we've reset its key, we can take control of it in the wallet:
unlock abc
import_key 5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3
list_my_accounts
transfer ezira dantheman "1.234 EZIRA" "make -j100 money" true
transfer ezira dantheman "1.234 ECO" "make -j100 money" true
list_my_accounts
get_account_history ezira -1 1000

Expand Down
2 changes: 1 addition & 1 deletion example_plugins/hello_api/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
file(GLOB HEADERS "include/ezira/plugins/hello_api/*.hpp")
file(GLOB HEADERS "include/eznode/plugins/hello_api/*.hpp")

add_library( hello_api
${HEADERS}
Expand Down
4 changes: 2 additions & 2 deletions example_plugins/hello_api/hello_api_plugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <sstream>
#include <string>

namespace ezira { namespace example_plugin {
namespace eznode { namespace example_plugin {

class hello_api_plugin : public eznode::app::plugin
{
Expand Down Expand Up @@ -68,7 +68,7 @@ FC_API( eznode::example_plugin::hello_api_api,
(get_message)
)

namespace ezira { namespace example_plugin {
namespace eznode { namespace example_plugin {

hello_api_plugin::hello_api_plugin( eznode::app::application* app ) : eznode::app::plugin(app) {}
hello_api_plugin::~hello_api_plugin() {}
Expand Down
4 changes: 2 additions & 2 deletions libraries/app/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
file(GLOB HEADERS "include/ezira/app/*.hpp")
file(GLOB HEADERS "include/eznode/app/*.hpp")

add_library( eznode_app
database_api.cpp
Expand All @@ -24,4 +24,4 @@ INSTALL( TARGETS
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
INSTALL( FILES ${HEADERS} DESTINATION "include/ezira/app" )
INSTALL( FILES ${HEADERS} DESTINATION "include/eznode/app" )
2 changes: 1 addition & 1 deletion libraries/app/api.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
#include <graphene/utilities/git_revision.hpp>
#include <fc/git_revision.hpp>

namespace ezira { namespace app {
namespace eznode { namespace app {

login_api::login_api(const api_context& ctx)
:_ctx(ctx)
Expand Down
2 changes: 1 addition & 1 deletion libraries/app/application.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@

#include <boost/range/adaptor/reversed.hpp>

namespace ezira { namespace app {
namespace eznode { namespace app {
using graphene::net::item_hash_t;
using graphene::net::item_id;
using graphene::net::message;
Expand Down
2 changes: 1 addition & 1 deletion libraries/app/database_api.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#define GET_REQUIRED_FEES_MAX_RECURSION 4

namespace ezira { namespace app {
namespace eznode { namespace app {

class database_api_impl;

Expand Down
2 changes: 1 addition & 1 deletion libraries/app/impacted.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

#include <fc/utility.hpp>

namespace ezira { namespace app {
namespace eznode { namespace app {

using namespace fc;
using namespace eznode::protocol;
Expand Down
32 changes: 32 additions & 0 deletions libraries/app/include/ezira/app/applied_operation.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#pragma once

#include <eznode/protocol/operations.hpp>
#include <eznode/chain/eznode_object_types.hpp>

namespace eznode { namespace app {

struct applied_operation
{
applied_operation();
applied_operation( const eznode::chain::operation_object& op_obj );

eznode::protocol::transaction_id_type trx_id;
uint32_t block = 0;
uint32_t trx_in_block = 0;
uint16_t op_in_trx = 0;
uint64_t virtual_op = 0;
fc::time_point_sec timestamp;
eznode::protocol::operation op;
};

} }

FC_REFLECT( eznode::app::applied_operation,
(trx_id)
(block)
(trx_in_block)
(op_in_trx)
(virtual_op)
(timestamp)
(op)
)
Loading

0 comments on commit 74e4386

Please sign in to comment.