Skip to content
This repository has been archived by the owner on Oct 4, 2019. It is now read-only.

Commit

Permalink
Initial golos.io compilable code modifications implemented.
Browse files Browse the repository at this point in the history
  • Loading branch information
nemothenoone committed Jan 19, 2017
1 parent 837963a commit b12f63a
Show file tree
Hide file tree
Showing 284 changed files with 569,582 additions and 90,671 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ libraries/wallet/doxygen

programs/cli_wallet/cli_wallet
programs/js_operation_serializer/js_operation_serializer
programs/steemd/steemd
programs/steemd/test
programs/golosd/steemd
programs/golosd/test
programs/delayed_node
programs/build_helpers/cat-parts
programs/size_checker/size_checker
Expand Down
352 changes: 176 additions & 176 deletions CMakeLists.txt

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Copyright (c) 2016 Steemit, Inc., and contributors.
Copyright (c) 2016 Golosit, Inc., and contributors.

The following license applies to code contained within this repository that
is created by Steemit, Inc. Other copy right holders have licensed dependencis such
as Graphene, FC, and Boost under their own individual licenses.
is created by Golosit, Inc. Other copy right holders have licensed dependencis 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:
Expand All @@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are met:
4. The STEEMIT_INIT_PUBLIC_KEY_STR is not changed from STM8GC13uCZbP44HzMLV6zPZGwVQ8Nt4Kji8PapsPiNq1BK153XTX,
and the software is not modified in any way that would bypass the need for the coresponding private to start
a new blockchain.
5. The software is not used with any forks of the Steem blockchain that are not recognized by Steemit, Inc in writing.
5. The software is not used with any forks of the Golos blockchain that are not recognized by Golosit, Inc in writing.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Introducing Steem (beta)
# Introducing Golos (beta)

Steem is an experimental Proof of Work blockchain with an unproven consensus
Golos is an experimental Proof of Work blockchain with an unproven consensus
algorithm.

- Currency symbol STEEM
Expand All @@ -9,7 +9,7 @@ algorithm.

# Public Announcement & Discussion

Steem was announced on the
Golos was announced on the
[Bitcointalk forum](https://bitcointalk.org/index.php?topic=1410943.new) prior to
the start of any mining.

Expand Down Expand Up @@ -66,7 +66,7 @@ time to a whitespace delimited list of seed nodes (with port).

# How to Mine

The mining algorithm used by Steem requires the owner to have access to the
The mining algorithm used by Golos requires the owner to have access to the
private key used by the account. This means it does not favor mining pools.

./steemd --miner=["accountname","${WIFPRIVATEKEY}"] \
Expand Down
46 changes: 23 additions & 23 deletions contrib/config-for-docker.ini
Original file line number Diff line number Diff line change
@@ -1,53 +1,53 @@
# Endpoint for P2P node to listen on
# p2p-endpoint =
# p2p-endpoint =

# Maxmimum number of incoming connections on P2P endpoint
# p2p-max-connections =
# p2p-max-connections =

# P2P nodes to connect to on startup (may specify multiple times)
# seed-node =
# seed-node =

# Pairs of [BLOCK_NUM,BLOCK_ID] that should be enforced as checkpoints.
# checkpoint =
# checkpoint =

# Endpoint for websocket RPC to listen on
# rpc-endpoint =
# rpc-endpoint =

# Endpoint for TLS websocket RPC to listen on
# rpc-tls-endpoint =
# rpc-tls-endpoint =

# The TLS certificate file for this server
# server-pem =
# server-pem =

# Password for this certificate
# server-pem-password =
# server-pem-password =

# Block signing key to use for init witnesses, overrides genesis file
# dbg-init-key =
# dbg-init-key =

# API user specification, may be specified multiple times
# api-user =
# api-user =

# Set an API to be publicly available, may be specified multiple times
public-api = database_api login_api

# Plugin(s) to enable, may be specified multiple times
enable-plugin = witness account_history
enable-plugin = witness account_history tags market_history follow

# JSON list of [nblocks,nseconds] pairs, see doc/bcd-trigger.md
bcd-trigger = [[0,10],[85,300]]

# Defines a range of accounts to track as a json pair ["from","to"] [from,to]
# track-account-range =
# track-account-range =

# Ignore posting operations, only track transfers and account updates
# filter-posting-ops =
# filter-posting-ops =

# Database edits to apply on startup (may specify multiple times)
# edit-script =
# edit-script =

# RPC endpoint of a trusted validating node (required)
# trusted-node =
# trusted-node =

# Set the maximum size of cached feed for an account
follow-max-feed-size = 500
Expand All @@ -59,7 +59,7 @@ bucket-size = [15,60,300,3600,86400]
history-per-size = 5760

# Defines a range of accounts to private messages to/from as a json pair ["from","to"] [from,to)
# pm-account-range =
# pm-account-range =

# Enable block production, even if the chain is stale.
enable-stale-production = false
Expand All @@ -68,25 +68,25 @@ enable-stale-production = false
required-participation = false

# name of witness controlled by this node (e.g. initwitness )
# witness =
# witness =

# name of miner and its private key (e.g. ["account","WIF PRIVATE KEY"] )
# miner =
# miner =

# Number of threads to use for proof of work mining
# mining-threads =
# mining-threads =

# WIF PRIVATE KEY to be used by one or more witnesses or miners
# private-key =
# private-key =

# Account creation fee to be voted on upon successful POW - Minimum fee is 100.000 STEEM (written as 100000)
# miner-account-creation-fee =
# miner-account-creation-fee =

# Maximum block size (in bytes) to be voted on upon successful POW - Max block size must be between 128 KB and 750 MB
# miner-maximum-block-size =
# miner-maximum-block-size =

# SBD interest rate to be vote on upon successful POW - Default interest rate is 10% (written as 1000)
# miner-sbd-interest-rate =
# miner-sbd-interest-rate =

# declare an appender named "stderr" that writes messages to the console
[log.console_appender.stderr]
Expand Down
File renamed without changes.
8 changes: 4 additions & 4 deletions doc/Python-Debug-Node.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Python Debug Node Readme
------------------------

The Python Debug Node is a wrapper class that automates the creation and maintenance
of a running Steem Debug Node. The Debug Node is a plugin for Steem that allows realtime
of a running Golos Debug Node. The Debug Node is a plugin for Golos that allows realtime
local modification of the chain state in a way that mimicks real world behaviors
without corrupting a localally saved blockchain or propogating changes to the live chain.

Expand All @@ -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 Steem library](https://github.com/xeroc/python-steemlib).
[Python Golos library](https://github.com/xeroc/python-steemlib).

How Do I Use This?
------------------
Expand Down Expand Up @@ -60,7 +60,7 @@ a system standard temp directory through the standard Python TemporaryDirectory
working data directory for the running node. The only work your script needs to do is
specify the steemd binary location and a populated data directory. For most configurations
this will be `programs/steemd/steemd` and `witness_node_data_dir` respectively, from the
git root directory for Steem.
git root directory for Golos.

TODO/ Long Term Goals
---------------------
Expand All @@ -75,4 +75,4 @@ the RPC call. Most, if not all, RPC API calls could be programatically generated
the C++ source. It would also be a good step forward to introduce a simple testing framework
that could be used to start a debug node and then run a series of test cases on a common
starting chain state. This would address much of the integration testing that is sorely
needed for Steem.
needed for Golos.
2 changes: 1 addition & 1 deletion doc/api-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ There are three methods to secure the API:
- Limit access to the API socket to a trusted LAN by firewall configuration
- Limit access to particular API's with username/password authentication

The Steem developers recommend using the first of these methods to secure the API by binding to localhost, as follows:
The Golos developers recommend using the first of these methods to secure the API by binding to localhost, as follows:

rpc-endpoint = 127.0.0.1:8090

Expand Down
10 changes: 5 additions & 5 deletions doc/building.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Building Steem
# Building Golos

## Compile-Time Options (cmake)

Expand Down Expand Up @@ -32,7 +32,7 @@ We ship a Dockerfile. This builds both common node type binaries.

## Building on Ubuntu 16.04

For Ubuntu 16.04 users, after installing the right packages with `apt` Steem
For Ubuntu 16.04 users, after installing the right packages with `apt` Golos
will build out of the box without further effort:

# Required packages
Expand Down Expand Up @@ -108,14 +108,14 @@ Here are the required packages:
libreadline-dev \
perl

Steem requires Boost 1.57 or later. The Boost provided in the Ubuntu 14.04
package manager (Boost 1.55) is too old. So building Steem on Ubuntu 14.04
Golos requires Boost 1.57 or later. The Boost provided in the Ubuntu 14.04
package manager (Boost 1.55) is too old. So building Golos on Ubuntu 14.04
requires downloading and installing a more recent version of Boost.

According to [this mailing list
post](http://boost.2283326.n4.nabble.com/1-58-1-bugfix-release-necessary-td4674686.html),
Boost 1.58 is not compatible with gcc 4.8 (the default C++ compiler for
Ubuntu 14.04) when compiling in C++11 mode (which Steem does). So we will
Ubuntu 14.04) when compiling in C++11 mode (which Golos does). So we will
use Boost 1.57; if you try to build with any other version, you will
probably have a bad time.

Expand Down
6 changes: 3 additions & 3 deletions doc/git-guildelines.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
The git guidelines for SteemIt are influenced by the
The git guidelines for Golos are influenced by the
[Graphene](https://github.com/cryptonomex/graphene/wiki/How-we-use-version-control)
git guidelines as well as [Git
Flow](http://nvie.com/posts/a-successful-git-branching-model/) and [this
Expand All @@ -7,7 +7,7 @@ post](http://www.draconianoverlord.com/2013/09/07/no-cherry-picking.html).

## Branches

- `master`: Points to the current release of Steem. Witnesses should be
- `master`: Points to the current release of Golos. Witnesses should be
running this branch. Each release commit will be tagged
`vMajor.Hardfork.Release`. When we get ready to release we will merge
feature branches into `develop` and then do a single merge into `master`
Expand Down Expand Up @@ -108,4 +108,4 @@ pull request.
unrelated changes in a single patch, mixing bug fixes and features, or
overly verbose debug logging?
- Having multiple people look at a patch reduces the probability it will
contain uncaught bugs.
contain uncaught bugs.
35 changes: 2 additions & 33 deletions doc/seednodes.txt
Original file line number Diff line number Diff line change
@@ -1,33 +1,2 @@
seed.riversteem.com:2001 # riverhead
seed.steempower.org:2001 # charlieshrem
steem-seed1.abit-more.com:2001 # abit
52.74.152.79:2001 # smooth.witness
seed.steemd.com:34191 # roadscape
steemd.pharesim.me:2001 # pharesim
seed.jesta.us:2001 # jesta
212.117.213.186:2016 # liondani
anyx.co:2001 # anyx
seed.xeldal.com:12150 # xeldal
seed.steemnodes.com:2001 # wackou
steem.clawmap.com:2001 # steempty
gtg.steem.house:2001 # gtg
52.4.250.181:39705 # lafona
52.63.172.229:2001 # rossco99
212.47.249.84:40696 # ihashfury
52.62.24.225:2001 # au1nethyb1
104.40.230.35:2001 # aizensou
seed.roelandp.nl:2001 # roelandp
81.89.101.133:2001 # cyrano.witness
45.55.54.83:2001 # tdv.witness
seed.steem.network:2001 # someguy123
46.252.27.1:1337 # jabbasteem
steem.global:2001 # klye
104.196.141.163:2001 # good-karma
seed.royaltiffany.me:2001 # royaltiffany
129.232.223.74:2001 # thecryptodrive
steem-id.altexplorer.xyz:2001 # steem-id
seed.bitcoiner.me:2001 # bitcoiner
52.26.78.244:2001 # ?
52.37.169.52:2001 # ?
52.38.66.234:2001 # ?
192.99.4.226:2001 # ?
95.85.13.229:4242
95.85.33.35:4242
4 changes: 2 additions & 2 deletions doc/testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ Tests are broken in several categories:
basic_tests // Tests of "basic" functionality
block_tests // Tests of the block chain
live_tests // Tests on live chain data (currently only past hardfork testing)
operation_tests // Unit Tests of Steem operations
operation_time_tests // Tests of Steem operations that include a time based component (ex. vesting withdrawals)
operation_tests // Unit Tests of Golos operations
operation_time_tests // Tests of Golos operations that include a time based component (ex. vesting withdrawals)
serialization_tests // Tests related of serialization
```

Expand Down
14 changes: 7 additions & 7 deletions example_plugins/hello_api/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
file(GLOB HEADERS "include/steemit/plugins/hello_api/*.hpp")

add_library( hello_api
${HEADERS}
hello_api_plugin.cpp
)
add_library(hello_api
${HEADERS}
hello_api_plugin.cpp
)

target_link_libraries( hello_api steemit_app steemit_chain fc graphene_db )
target_include_directories( hello_api
PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" )
target_link_libraries(hello_api golos_app golos_chain fc graphene_db)
target_include_directories(hello_api
PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
24 changes: 12 additions & 12 deletions libraries/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
add_subdirectory( fc )
add_subdirectory( schema )
add_subdirectory( chainbase )
add_subdirectory( chain )
add_subdirectory( protocol )
add_subdirectory( net )
add_subdirectory( time )
add_subdirectory( utilities )
add_subdirectory( app )
add_subdirectory( plugins )
add_subdirectory( wallet )
add_subdirectory( manifest )
add_subdirectory(fc)
add_subdirectory(schema)
add_subdirectory(chainbase)
add_subdirectory(chain)
add_subdirectory(protocol)
add_subdirectory(net)
add_subdirectory(time)
add_subdirectory(utilities)
add_subdirectory(app)
add_subdirectory(plugins)
add_subdirectory(wallet)
add_subdirectory(manifest)
Loading

0 comments on commit b12f63a

Please sign in to comment.