Merge pull request #686 from GolosChain/golos-v0.18.0

Golos v0.18.0

Author: afalaleev

.travis.yml

@@ -9,21 +9,36 @@ before_install:
   - echo "$TRAVIS_TAG"
   - echo "$TRAVIS_BRANCH"
 
+env:
+  - DOCKERFILE=Dockerfile DOCKERNAME=""
+  - DOCKERFILE=share/golosd/docker/Dockerfile-test DOCKERNAME="-test"
+  - DOCKERFILE=share/golosd/docker/Dockerfile-testnet DOCKERNAME="-testnet"
+  - DOCKERFILE=share/golosd/docker/Dockerfile-lowmem DOCKERNAME="-lowmem"
+
+matrix:
+  fast_finish: true
+
 script:
-  - if [ -n "${TRAVIS_TAG}" ]; then
-      docker build -t goloschain/golos:"$TRAVIS_TAG" . ;
+  - if [ "$TRAVIS_BRANCH" == "master" ]; then
+      export DOCKERNAME="latest""$DOCKERNAME";
+      export EXPORTNAME="latest""$DOCKERNAME";
+    elif [ -n "$TRAVIS_TAG" ]; then
+      export DOCKERNAME="$TRAVIS_TAG""$DOCKERNAME";
+      export EXPORTNAME="$TRAVIS_TAG""$DOCKERNAME";
     else
-      docker build -t goloschain/golos:latest . ;
+      export DOCKERNAME=develop"$DOCKERNAME";
     fi
-  - docker images
+  - echo "$DOCKERFILE"
+  - echo "$DOCKERNAME"
+  - docker build -t goloschain/golos:"$DOCKERNAME" -f "$DOCKERFILE" .
 
 after_success:
-  - if [ "$TRAVIS_BRANCH" == "master" ]; then
+  - echo "$EXPORTNAME"
+  - docker images
+  - if [ -n "$EXPORTNAME" ]; then
       docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
-      docker push goloschain/golos:latest;
-      bash deploy/deploy.sh;
+      docker push goloschain/golos:"$EXPORTNAME";
     fi
-  - if [ -n "$TRAVIS_TAG" ]; then
-      docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
-      docker push goloschain/golos:"$TRAVIS_TAG";
+  - if [ "$TRAVIS_BRANCH" == "master" -a "$EXPORTNAME" == "latest" ]; then
+      bash deploy/deploy.sh;
     fi

CMakeLists.txt

@@ -65,7 +65,10 @@ endif()
 
 option(MAX_19_VOTED_WITNESSES "Build source with 19 voted witnesses (ON OR OFF)" OFF)
 message(STATUS "MAX_19_VOTED_WITNESSES: ${MAX_19_VOTED_WITNESSES}")
-if(BUILD_GOLOS_TESTNET)
+if(MAX_19_VOTED_WITNESSES AND BUILD_GOLOS_TESTNET)
+    message(STATUS "     ")
+    message(STATUS "             CONFIGURING FOR 19 VOTED WITNESSES   ")
+    message(STATUS "     ")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTEEMIT_MAX_VOTED_WITNESSES=19")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSTEEMIT_MAX_VOTED_WITNESSES=19")
 endif()

Dockerfile

@@ -1,7 +1,5 @@
 FROM phusion/baseimage:0.9.19
 
-#ARG STEEMD_BLOCKCHAIN=https://example.com/steemd-blockchain.tbz2
-
 ENV LANG=en_US.UTF-8
 
 RUN \
@@ -35,7 +33,8 @@ ADD . /usr/local/src/golos
 
 RUN \
     cd /usr/local/src/golos && \
-    git submodule update --init --recursive && \
+    git submodule deinit -f . && \
+    git submodule update --init --recursive -f && \
     mkdir build && \
     cd build && \
     cmake \

LICENSE.md

@@ -1,19 +1,20 @@
-Copyright (c) 2017 Golos Core, and contributors.
+Copyright (c) 2018 Golos Core, and contributors.
 
 The following license applies to code contained within this repository that
-is created by Golos Core. Other copy right holders have licensed dependencies such
-as Graphene, FC, and Boost under their own individual licenses.
+is created by Golos Core. Other copyright holders have licensed dependencies
+such as Graphene, FC, and Boost under their own individual licenses.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+The MIT License
 
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-3. The currency symbols, 'GOLOS' and 'GBG' are not changed and no new currency symbols are added.
-4. The STEEMIT_INIT_PUBLIC_KEY_STR is not changed from GLS7KVuKX87DK44xmhAD92hqJeR8Acd1TBKCtVnGLC5VDpER5CtWE,
-and the software is not modified in any way that would bypass the need for the corresponding private to start
-a new blockchain.
-5. The software is not used with any forks of the Golos blockchain that are not recognized by Golos Foundation in writing.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

documentation/testing.md

@@ -13,6 +13,16 @@ operation_time_tests // Tests of Golos operations that include a time based comp
 serialization_tests  // Tests related of serialization
 ```
 
+## Configuration (draft)
+
+Some config options:
+* `log_level` — allows setting the log level. Available values: `all`, `success`, `test_suite`, `message`, `warning`, . `error`, `cpp_exception`, `system_error`, `fatal_error`, `nothing`. Sample usage: `--log-level=test_suite`
+* `report_level` — allows setting the level of detailization for the testing results report. Available values: `no`, `confirm`, `short`, `detailed`. Sample usage: `--report_level=detailed`
+* `run_test` — specifies which test units to run. You can specify individual test (separated with comma) or test cases. Sample usage: `--run_test=operation_tests/delegation`
+
+For more info about runtime config check [Boost.Tests documentation](https://www.boost.org/doc/libs/1_58_0/libs/test/doc/html/utf/user-guide/runtime-config/reference.html).
+
+
 # Code Coverage Testing
 
 If you have not done so, install lcov `brew install lcov`

libraries/CMakeLists.txt

@@ -1,3 +1,4 @@
+add_subdirectory(api)
 add_subdirectory(chain)
 add_subdirectory(protocol)
 add_subdirectory(network)

libraries/api/CMakeLists.txt

@@ -0,0 +1,54 @@
+set(CURRENT_TARGET api)
+
+list(APPEND CURRENT_TARGET_HEADERS
+    include/golos/api/account_api_object.hpp
+    include/golos/api/comment_api_object.hpp
+    include/golos/api/chain_api_properties.hpp
+    include/golos/api/witness_api_object.hpp
+    include/golos/api/discussion.hpp
+    include/golos/api/vote_state.hpp
+    include/golos/api/account_vote.hpp
+    include/golos/api/discussion_helper.hpp
+)
+
+list(APPEND CURRENT_TARGET_SOURCES
+    account_api_object.cpp
+    discussion_helper.cpp
+    comment_api_object.cpp
+    chain_api_properties.cpp
+    witness_api_object.cpp
+)
+
+if(BUILD_SHARED_LIBRARIES)
+    add_library(golos_${CURRENT_TARGET} SHARED
+        ${CURRENT_TARGET_HEADERS}
+        ${CURRENT_TARGET_SOURCES}
+    )
+else()
+    add_library(golos_${CURRENT_TARGET} STATIC
+        ${CURRENT_TARGET_HEADERS}
+        ${CURRENT_TARGET_SOURCES}
+    )
+endif()
+
+add_library(golos::${CURRENT_TARGET} ALIAS golos_${CURRENT_TARGET})
+set_property(TARGET golos_${CURRENT_TARGET} PROPERTY EXPORT_NAME ${CURRENT_TARGET})
+
+target_link_libraries(
+    golos_${CURRENT_TARGET}
+    golos_chain
+    golos_protocol
+    graphene_utilities
+    fc
+)
+
+target_include_directories(golos_${CURRENT_TARGET}
+        PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
+
+install(TARGETS
+        golos_${CURRENT_TARGET}
+
+        RUNTIME DESTINATION bin
+        LIBRARY DESTINATION lib
+        ARCHIVE DESTINATION lib
+        )

libraries/api/account_api_object.cpp

@@ -0,0 +1,89 @@
+#include <golos/api/account_api_object.hpp>
+
+namespace golos { namespace api {
+
+using golos::chain::by_account;
+using golos::chain::by_account_bandwidth_type;
+using golos::chain::account_bandwidth_object;
+using golos::chain::account_authority_object;
+using golos::chain::account_metadata_object;
+using golos::chain::bandwidth_type;
+
+account_api_object::account_api_object(const account_object& a, const golos::chain::database& db)
+    :   id(a.id), name(a.name), memo_key(a.memo_key), proxy(a.proxy),
+        last_account_update(a.last_account_update), created(a.created), mined(a.mined),
+        owner_challenged(a.owner_challenged), active_challenged(a.active_challenged),
+        last_owner_proved(a.last_owner_proved), last_active_proved(a.last_active_proved),
+        recovery_account(a.recovery_account), reset_account(a.reset_account),
+        last_account_recovery(a.last_account_recovery), comment_count(a.comment_count),
+        lifetime_vote_count(a.lifetime_vote_count), post_count(a.post_count), can_vote(a.can_vote),
+        voting_power(a.voting_power), last_vote_time(a.last_vote_time),
+        balance(a.balance), savings_balance(a.savings_balance),
+        sbd_balance(a.sbd_balance), sbd_seconds(a.sbd_seconds),
+        sbd_seconds_last_update(a.sbd_seconds_last_update),
+        sbd_last_interest_payment(a.sbd_last_interest_payment),
+        savings_sbd_balance(a.savings_sbd_balance), savings_sbd_seconds(a.savings_sbd_seconds),
+        savings_sbd_seconds_last_update(a.savings_sbd_seconds_last_update),
+        savings_sbd_last_interest_payment(a.savings_sbd_last_interest_payment),
+        savings_withdraw_requests(a.savings_withdraw_requests),
+        curation_rewards(a.curation_rewards), posting_rewards(a.posting_rewards),
+        vesting_shares(a.vesting_shares),
+        delegated_vesting_shares(a.delegated_vesting_shares), received_vesting_shares(a.received_vesting_shares),
+        vesting_withdraw_rate(a.vesting_withdraw_rate), next_vesting_withdrawal(a.next_vesting_withdrawal),
+        withdrawn(a.withdrawn), to_withdraw(a.to_withdraw), withdraw_routes(a.withdraw_routes),
+        witnesses_voted_for(a.witnesses_voted_for), last_post(a.last_post) {
+    size_t n = a.proxied_vsf_votes.size();
+    proxied_vsf_votes.reserve(n);
+    for (size_t i = 0; i < n; i++) {
+        proxied_vsf_votes.push_back(a.proxied_vsf_votes[i]);
+    }
+
+    const auto& auth = db.get<account_authority_object, by_account>(name);
+    owner = authority(auth.owner);
+    active = authority(auth.active);
+    posting = authority(auth.posting);
+    last_owner_update = auth.last_owner_update;
+
+#ifndef IS_LOW_MEM
+    const auto& meta = db.get<account_metadata_object, by_account>(name);
+    json_metadata = golos::chain::to_string(meta.json_metadata);
+#endif
+
+    auto old_forum = db.find<account_bandwidth_object, by_account_bandwidth_type>(
+            std::make_tuple(name, bandwidth_type::old_forum));
+    if (old_forum != nullptr) {
+        average_bandwidth = old_forum->average_bandwidth;
+        lifetime_bandwidth = old_forum->lifetime_bandwidth;
+        last_bandwidth_update = old_forum->last_bandwidth_update;
+    }
+
+    auto old_market = db.find<account_bandwidth_object, by_account_bandwidth_type>(
+            std::make_tuple(name, bandwidth_type::old_market));
+    if (old_market != nullptr) {
+        average_market_bandwidth = old_market->average_bandwidth;
+        last_market_bandwidth_update = old_market->last_bandwidth_update;
+    }
+
+    auto post = db.find<account_bandwidth_object, by_account_bandwidth_type>(
+            std::make_tuple(name, bandwidth_type::post));
+    if (post != nullptr) {
+        last_root_post = post->last_bandwidth_update;
+        post_bandwidth = post->average_bandwidth;
+    }
+
+    auto forum = db.find<account_bandwidth_object, by_account_bandwidth_type>(
+            std::make_tuple(name, bandwidth_type::forum));
+    if (forum != nullptr) {
+        new_average_bandwidth = forum->average_bandwidth;
+    }
+
+    auto market = db.find<account_bandwidth_object, by_account_bandwidth_type>(
+            std::make_tuple(name, bandwidth_type::market));
+    if (market != nullptr) {
+        new_average_market_bandwidth = market->average_bandwidth;
+    }
+}
+
+account_api_object::account_api_object() {}
+
+} } // golos::api

libraries/api/chain_api_properties.cpp

@@ -0,0 +1,20 @@
+#include <golos/api/chain_api_properties.hpp>
+
+namespace golos { namespace api {
+
+    chain_api_properties::chain_api_properties(
+        const chain_properties& src,
+        const database& db
+    ) : account_creation_fee(src.account_creation_fee),
+        maximum_block_size(src.maximum_block_size),
+        sbd_interest_rate(src.sbd_interest_rate)
+    {
+        if (db.has_hardfork(STEEMIT_HARDFORK_0_18__673)) {
+            create_account_with_golos_modifier = src.create_account_with_golos_modifier;
+            create_account_delegation_ratio = src.create_account_delegation_ratio;
+            create_account_delegation_time = src.create_account_delegation_time;
+            min_delegation_multiplier = src.min_delegation_multiplier;
+        }
+    }
+
+} } // golos::api

libraries/api/comment_api_object.cpp

@@ -0,0 +1,59 @@
+#include <golos/api/comment_api_object.hpp>
+
+namespace golos { namespace api {
+
+    using namespace golos::chain;
+
+    comment_api_object::comment_api_object(const golos::chain::comment_object &o, const golos::chain::database &db)
+        : id(o.id),
+          parent_author(o.parent_author),
+          parent_permlink(to_string(o.parent_permlink)),
+          author(o.author),
+          permlink(to_string(o.permlink)),
+          last_update(o.last_update),
+          created(o.created),
+          active(o.active),
+          last_payout(o.last_payout),
+          depth(o.depth),
+          children(o.children),
+          children_rshares2(o.children_rshares2),
+          net_rshares(o.net_rshares),
+          abs_rshares(o.abs_rshares),
+          vote_rshares(o.vote_rshares),
+          children_abs_rshares(o.children_abs_rshares),
+          cashout_time(o.cashout_time),
+          max_cashout_time(o.max_cashout_time),
+          total_vote_weight(o.total_vote_weight),
+          reward_weight(o.reward_weight),
+          total_payout_value(o.total_payout_value),
+          curator_payout_value(o.curator_payout_value),
+          author_rewards(o.author_rewards),
+          net_votes(o.net_votes),
+          mode(o.mode),
+          root_comment(o.root_comment),
+          max_accepted_payout(o.max_accepted_payout),
+          percent_steem_dollars(o.percent_steem_dollars),
+          allow_replies(o.allow_replies),
+          allow_votes(o.allow_votes),
+          allow_curation_rewards(o.allow_curation_rewards) {
+
+        for (auto& route : o.beneficiaries) {
+            beneficiaries.push_back(route);
+        }
+#ifndef IS_LOW_MEM
+        auto& content = db.get_comment_content(o.id);
+
+        title = to_string(content.title);
+        body = to_string(content.body);
+        json_metadata = to_string(content.json_metadata);
+#endif
+        if (o.parent_author == STEEMIT_ROOT_POST_PARENT) {
+            category = to_string(o.parent_permlink);
+        } else {
+            category = to_string(db.get<comment_object, by_id>(o.root_comment).parent_permlink);
+        }
+    }
+
+    comment_api_object::comment_api_object() = default;
+
+} } // golos::api