Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: steemit/steem
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: dpays/dpay
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dstable
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 8 commits
  • 556 files changed
  • 1 contributor

Commits on Sep 22, 2018

  1. Pushed 0.20.2-build

    @JaredRiceSr
    JaredRiceSr committed Sep 22, 2018
    Copy the full SHA
    36bb63d View commit details

  2. Removed set_hardfork out of database.cpp

    @JaredRiceSr
    JaredRiceSr committed Sep 22, 2018
    Copy the full SHA
    5926690 View commit details

Commits on Sep 25, 2018

  1. Fixed init_miner getting actual keys when starting a new network, thr… 

    …ough hardfork 9
    @JaredRiceSr
    JaredRiceSr committed Sep 25, 2018
    Copy the full SHA
    e9a90d2 View commit details

  2. Added chain-id option to cli-wallet and chain_plugin to allow for the… 

    … creation of Steem forks
    @JaredRiceSr
    JaredRiceSr committed Sep 25, 2018
    Copy the full SHA
    ff9e6f0 View commit details

  3. Pushed to stable

    @JaredRiceSr
    JaredRiceSr committed Sep 25, 2018
    Copy the full SHA
    06862d3 View commit details

  4. Stable

    @JaredRiceSr
    JaredRiceSr committed Sep 25, 2018
    Copy the full SHA
    96f3d03 View commit details

  5. Updated Dockerfile

    @JaredRiceSr
    JaredRiceSr committed Sep 25, 2018
    Copy the full SHA
    8d7e70a View commit details

  6. Fixed shared_authority error

    @JaredRiceSr
    JaredRiceSr committed Sep 25, 2018
    Copy the full SHA
    e6e5477 View commit details
Showing 556 changed files with 10,031 additions and 12,062 deletions.
4 changes: 2 additions & 2 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -21,8 +21,8 @@ libraries/wallet/doxygen

programs/cli_wallet/cli_wallet
programs/js_operation_serializer/js_operation_serializer
programs/steemd/steemd
programs/steemd/test
programs/dpayd/dpayd
programs/dpayd/test
programs/delayed_node
programs/build_helpers/cat-parts
programs/size_checker/size_checker
66 changes: 32 additions & 34 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Defines Steem library target.
project( Steem )
# Defines dPay library target.
project( dPay )
cmake_minimum_required( VERSION 3.2 )

set( BLOCKCHAIN_NAME "Steem" )
set( BLOCKCHAIN_NAME "dPay" )
set( CMAKE_CXX_STANDARD 14 )

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

@@ -51,9 +51,9 @@ LIST(APPEND BOOST_COMPONENTS thread
coroutine)
SET( Boost_USE_STATIC_LIBS ON CACHE STRING "ON or OFF" )

OPTION( BUILD_STEEM_TESTNET "Build source for test network (ON OR OFF)" OFF )
MESSAGE( STATUS "BUILD_STEEM_TESTNET: ${BUILD_STEEM_TESTNET}" )
if( BUILD_STEEM_TESTNET )
OPTION( BUILD_DPAY_TESTNET "Build source for test network (ON OR OFF)" OFF )
MESSAGE( STATUS "BUILD_DPAY_TESTNET: ${BUILD_DPAY_TESTNET}" )
if( BUILD_DPAY_TESTNET )
MESSAGE( STATUS " " )
MESSAGE( STATUS " CONFIGURING FOR TEST NET " )
MESSAGE( STATUS " " )
@@ -67,8 +67,8 @@ if( ENABLE_SMT_SUPPORT )
MESSAGE( STATUS " " )
MESSAGE( STATUS " CONFIGURING FOR SMT SUPPORT " )
MESSAGE( STATUS " " )
SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTEEM_ENABLE_SMT" )
SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSTEEM_ENABLE_SMT" )
SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDPAY_ENABLE_SMT" )
SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDPAY_ENABLE_SMT" )
endif()

OPTION( ENABLE_STD_ALLOCATOR_SUPPORT "Build source with STD allocator (ON OR OFF)" OFF )
@@ -112,14 +112,14 @@ if( SKIP_BY_TX_ID )
SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSKIP_BY_TX_ID" )
endif()

OPTION( STEEM_STATIC_BUILD "Build steemd as a static library (ON or OFF)" OFF )
if( STEEM_STATIC_BUILD AND ( ( MSVC AND NOT MINGW ) OR APPLE ) )
OPTION( DPAY_STATIC_BUILD "Build dpayd as a static library (ON or OFF)" OFF )
if( DPAY_STATIC_BUILD AND ( ( MSVC AND NOT MINGW ) OR APPLE ) )
MESSAGE( STATUS "Statuc build is not available on Windows or OS X" )
SET( STEEM_STATIC_BUILD OFF )
SET( DPAY_STATIC_BUILD OFF )
endif()
MESSAGE( STATUS "STEEM_STATIC_BUILD: ${STEEM_STATIC_BUILD}" )
MESSAGE( STATUS "DPAY_STATIC_BUILD: ${DPAY_STATIC_BUILD}" )

SET( STEEM_LINT_LEVEL "OFF" CACHE STRING "Lint level during steem build (FULL, HIGH, LOW, OFF)" )
SET( DPAY_LINT_LEVEL "OFF" CACHE STRING "Lint level during dPay build (FULL, HIGH, LOW, OFF)" )
find_program(
CLANG_TIDY_EXE
NAMES "clang-tidy"
@@ -132,13 +132,13 @@ elseif( VERSION LESS 3.6 )
messgae( STATUS "clang-tidy found but only supported with CMake version >= 3.6" )
else()
message( STATUS "clany-tidy found: ${CLANG_TIDY_EXE}" )
if( "${STEEM_LINT_LEVEL}" STREQUAL "FULL" )
if( "${DPAY_LINT_LEVEL}" STREQUAL "FULL" )
message( STATUS "Linting level set to: FULL" )
set( DO_CLANG_TIDY "${CLANG_TIDY_EXE}" "-checks='*'" )
elseif( "${STEEM_LINT_LEVEL}" STREQUAL "HIGH" )
elseif( "${DPAY_LINT_LEVEL}" STREQUAL "HIGH" )
message( STATUS "Linting level set to: HIGH" )
set( DO_CLANG_TIDY "${CLANG_TIDY_EXE}" "-checks='boost-use-to-string,clang-analyzer-*,cppcoreguidelines-*,llvm-*,misc-*,performance-*,readability-*'" )
elseif( "${STEEM_LINT_LEVEL}" STREQUAL "LOW" )
elseif( "${DPAY_LINT_LEVEL}" STREQUAL "LOW" )
message( STATUS "Linting level set to: LOW" )
set( DO_CLANG_TIDY "${CLANG_TIDY_EXE}" "-checks='clang-analyzer-*'" )
else()
@@ -157,7 +157,7 @@ FIND_PACKAGE(Boost 1.58 REQUIRED COMPONENTS ${BOOST_COMPONENTS})

if( WIN32 )

message( STATUS "Configuring Steem on WIN32")
message( STATUS "Configuring dPay on WIN32")
set( DB_VERSION 60 )
set( BDB_STATIC_LIBS 1 )

@@ -211,11 +211,11 @@ else( WIN32 ) # Apple AND Linux

if( APPLE )
# Apple Specific Options Here
message( STATUS "Configuring Steem on OS X" )
message( STATUS "Configuring dPay 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 Steem on Linux" )
message( STATUS "Configuring dPay on Linux" )
set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -std=c++11 -Wall" )
set( rt_library rt )
set( pthread_library pthread)
@@ -247,7 +247,7 @@ else( WIN32 ) # Apple AND Linux

endif( WIN32 )

set(ENABLE_COVERAGE_TESTING FALSE CACHE BOOL "Build Steem for code coverage analysis")
set(ENABLE_COVERAGE_TESTING FALSE CACHE BOOL "Build dPay for code coverage analysis")

if(ENABLE_COVERAGE_TESTING)
SET(CMAKE_CXX_FLAGS "--coverage ${CMAKE_CXX_FLAGS}")
@@ -257,7 +257,7 @@ endif()
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing -Werror -DBOOST_THREAD_DONT_PROVIDE_PROMISE_LAZY" )
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-strict-aliasing -Werror -DBOOST_THREAD_DONT_PROVIDE_PROMISE_LAZY" )

# external_plugins needs to be compiled first because libraries/app depends on STEEM_EXTERNAL_PLUGINS being fully populated
# external_plugins needs to be compiled first because libraries/app depends on DPAY_EXTERNAL_PLUGINS being fully populated
add_subdirectory( external_plugins )
add_subdirectory( libraries )
add_subdirectory( programs )
@@ -277,24 +277,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 "steem")
set(CPACK_PACKAGE_VENDOR "Steemit, Inc.")
set(CPACK_PACKAGE_NAME "dpay")
set(CPACK_PACKAGE_VENDOR "dPay, DAO.")
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 Steem network")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A client for the Steem network")
set(CPACK_PACKAGE_DESCRIPTION "A client for the dPay network")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A client for the dPay network")
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "Steem ${CPACK_PACKAGE_VERSION}")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "dPay ${CPACK_PACKAGE_VERSION}")

if(WIN32)
SET(CPACK_GENERATOR "ZIP;NSIS")
set(CPACK_PACKAGE_NAME "Steem") # override above
set(CPACK_PACKAGE_NAME "dPay") # override above
set(CPACK_NSIS_EXECUTABLES_DIRECTORY .)
set(CPACK_NSIS_PACKAGE_NAME "Steem v${CPACK_PACKAGE_VERSION}")
set(CPACK_NSIS_PACKAGE_NAME "dPay v${CPACK_PACKAGE_VERSION}")
set(CPACK_NSIS_DISPLAY_NAME "${CPACK_NSIS_PACKAGE_NAME}")
set(CPACK_NSIS_DEFINES " !define MUI_STARTMENUPAGE_DEFAULTFOLDER \\\"Steem\\\"")
set(CPACK_NSIS_DEFINES " !define MUI_STARTMENUPAGE_DEFAULTFOLDER \\\"dPay\\\"")
# 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)

@@ -313,10 +313,10 @@ endif(LINUX)
include(CPack)
endif(ENABLE_INSTALLER)

if( BUILD_STEEM_TESTNET )
if( BUILD_DPAY_TESTNET )
MESSAGE( STATUS "\n\n CONFIGURED FOR TEST NETWORK \n\n" )
else()
MESSAGE( STATUS "\n\n CONFIGURED FOR STEEM NETWORK \n\n" )
MESSAGE( STATUS "\n\n CONFIGURED FOR DPAY NETWORK \n\n" )
endif()

if( ENABLE_SMT_SUPPORT )
@@ -336,5 +336,3 @@ if( LOW_MEMORY_NODE )
else()
MESSAGE( STATUS "\n\n CONFIGURED FOR FULL NODE \n\n" )
endif()


10 changes: 5 additions & 5 deletions CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# Please Read

Please read these instructions before submitting issues to the Steem GitHub repository. The issue tracker is for bugs and specific implementation discussion **only**. It should not be used for other purposes, as described below.
Please read these instructions before submitting issues to the dPay GitHub repository. The issue tracker is for bugs and specific implementation discussion **only**. It should not be used for other purposes, as described below.

## Bug Reports

If there is an existing feature that is not working correctly, or a glitch in the blockchain that is impacting user behaviour - please open an issue to report variance. Include as much relevant information as you can, including screen shots or log output when applicable, and steps to reproduce the issue.
If there is an existing feature that is not working correctly, or a glitch in the blockchain that is impacting user behavior - please open an issue to report variance. Include as much relevant information as you can, including screen shots or log output when applicable, and steps to reproduce the issue.

## Enhancement Suggestions

Do **not** use the issue tracker to suggest enhancements or improvements to the platform. The best place for these discussions is on Steemit.com. If there is a well vetted idea that has the support of the community that you feel should be considered by the development team, please email it to [sneak@steemit.com](mailto:sneak@steemit.com) for review.
Do **not** use the issue tracker to suggest enhancements or improvements to the platform. The best place for these discussions is on dSite.io. If there is a well vetted idea that has the support of the community that you feel should be considered by the development team, please email it to [labs@dpays.io](mailto:labs@dpays.io) for review.

## Implementation Discussion

@@ -22,9 +22,9 @@ This is not the place to make suggestions for product improvement (please see th

Please do a keyword search to see if there is already an existing issue before opening a new one.

## Steemit.com vs. Steem Blockchain
## dSite.io vs. dPay Blockchain

This issue tracker is only intended to track issues for the Steem blockchain. If the issue is with the Steemit.com website, please open an issue in the [Steemit.com Repository](https://github.com/steemit/steemit.com/).
This issue tracker is only intended to track issues for the dPay blockchain. If the issue is with the dSite.io website, please open an issue in the [dSite.io Repository](https://github.com/dsite).

## Pull Requests

Loading