PreRelease clearnings

Author: ninetor

.gitignore

@@ -5,6 +5,7 @@
 CMakeCache.txt
 CMakeFiles
 Makefile
+CMakeDoxyfile.in
 compile_commands.json
 moc_*
 *.moc

CMakeLists.txt

@@ -1,11 +1,11 @@
 # Defines LocalCoin library target.
-project( BitShares )
+project( LocalCoin )
 cmake_minimum_required( VERSION 2.8.12 )
 
-set( BLOCKCHAIN_NAME "BitShares" )
+set( BLOCKCHAIN_NAME "LocalCoin" )
 
 set( CLI_CLIENT_EXECUTABLE_NAME graphene_client )
-set( GUI_CLIENT_EXECUTABLE_NAME BitShares )
+set( GUI_CLIENT_EXECUTABLE_NAME LocalCoin )
 set( CUSTOM_URL_SCHEME "gcs" )
 set( INSTALLER_APP_ID "68ad7005-8eee-49c9-95ce-9eed97e5b347" )
 
@@ -102,6 +102,11 @@ if( WIN32 )
     SET(TCL_LIBS "${TCL_LIBS}${TCL_LIB_PATH}/${TCL_LIB_NAME}g${TCL_LIB_EXT}")
     SET(TCL_LIBRARY ${TCL_LIBS})
 
+	find_package( CURL )
+	set(CURL_STATICLIB ON) 
+	include_directories( ${CURL_INCLUDE_DIRS} )
+	link_directories( ${CURL_LIBRARIES} )
+
 else( WIN32 ) # Apple AND Linux
 
     if( APPLE )
@@ -177,15 +182,15 @@ set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSIO
 set(CPACK_PACKAGE_DESCRIPTION "A client for the LocalCoin network")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A client for the LocalCoin network")
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md")
-set(CPACK_PACKAGE_INSTALL_DIRECTORY "BitShares ${CPACK_PACKAGE_VERSION}")
+set(CPACK_PACKAGE_INSTALL_DIRECTORY "LocalCoin ${CPACK_PACKAGE_VERSION}")
 
 if(WIN32)
  SET(CPACK_GENERATOR "ZIP;NSIS")
- set(CPACK_PACKAGE_NAME "BitShares") # override above
+ set(CPACK_PACKAGE_NAME "LocalCoin") # override above
  set(CPACK_NSIS_EXECUTABLES_DIRECTORY .)
- set(CPACK_NSIS_PACKAGE_NAME "BitShares v${CPACK_PACKAGE_VERSION}")
+ set(CPACK_NSIS_PACKAGE_NAME "LocalCoin v${CPACK_PACKAGE_VERSION}")
  set(CPACK_NSIS_DISPLAY_NAME "${CPACK_NSIS_PACKAGE_NAME}")
- set(CPACK_NSIS_DEFINES "  !define MUI_STARTMENUPAGE_DEFAULTFOLDER \\\"BitShares\\\"")
+ set(CPACK_NSIS_DEFINES "  !define MUI_STARTMENUPAGE_DEFAULTFOLDER \\\"LocalCoin\\\"")
  # 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)
 

README.md

@@ -1,13 +1,6 @@
-LocalCoin Core
+LocalCoin Core - MasterNodes
 ==============
 
-[Build Status](https://travis-ci.org/LocalCoinIS/LocalCoin-core/branches):
-
-`master` | `develop` | `hardfork` | `testnet` | `localcoin-fc` 
- --- | --- | --- | --- | ---
- [![](https://travis-ci.org/LocalCoinIS/LocalCoin-core.svg?branch=master)](https://travis-ci.org/LocalCoinIS/LocalCoin-core) | [![](https://travis-ci.org/LocalCoinIS/LocalCoin-core.svg?branch=develop)](https://travis-ci.org/LocalCoinIS/LocalCoin-core) | [![](https://travis-ci.org/LocalCoinIS/LocalCoin-core.svg?branch=hardfork)](https://travis-ci.org/LocalCoinIS/LocalCoin-core) | [![](https://travis-ci.org/LocalCoinIS/LocalCoin-core.svg?branch=testnet)](https://travis-ci.org/LocalCoinIS/LocalCoin-core) | [![](https://travis-ci.org/LocalCoinIS/LocalCoin-fc.svg?branch=master)](https://travis-ci.org/LocalCoinIS/LocalCoin-fc) 
-
-
 * [Getting Started](#getting-started)
 * [Support](#support)
 * [Using the API](#using-the-api)
@@ -18,7 +11,7 @@ LocalCoin Core
 LocalCoin Core is the LocalCoin blockchain implementation and command-line interface.
 The web wallet is [LocalCoin UI](https://github.com/LocalCoinIS/LocalCoin-ui).
 
-Visit [localcoin.org](https://localcoin.org/) to learn about LocalCoin and join the community at [localcoinTalk.org](https://localcointalk.org/).
+Visit [localcoin.is](https://localcoin.is/) to learn about LocalCoin.
 
 **NOTE:** The official LocalCoin git repository location, default branch, and submodule remotes were recently changed. Existing
 repositories can be updated with the following steps:
@@ -33,7 +26,7 @@ repositories can be updated with the following steps:
 Getting Started
 ---------------
 Build instructions and additional documentation are available in the
-[wiki](https://github.com/LocalCoinIS/LocalCoin-core/wiki).
+[wiki](https://dev.localcoin.is).
 
 We recommend building on Ubuntu 16.04 LTS, and the build dependencies may be installed with:
 
@@ -88,14 +81,10 @@ Use `help` to see all available wallet commands. Source definition and listing o
 
 Support
 -------
-Technical support is available in the [localcoinTalk technical support subforum](https://localcointalk.org/index.php?board=45.0).
-
 LocalCoin Core bugs can be reported directly to the [issue tracker](https://github.com/LocalCoinIS/LocalCoin-core/issues).
 
 LocalCoin UI bugs should be reported to the [UI issue tracker](https://github.com/LocalCoinIS/LocalCoin-ui/issues)
 
-Up to date online Doxygen documentation can be found at [Doxygen](https://localcoin.org/doxygen/hierarchy.html)
-
 Using the API
 -------------
 
@@ -160,13 +149,6 @@ With the above configuration, here is an example of how to call `add_node` from
 
 Note, the call to `network_node` is necessary to obtain the correct API identifier for the network API.  It is not guaranteed that the network API identifier will always be `2`.
 
-Since the `network_node` API requires login, it is only accessible over the websocket RPC.  Our `doxygen` documentation contains the most up-to-date information
-about API's for the [witness node](https://localcoin.github.io/doxygen/namespacegraphene_1_1app.html) and the
-[wallet](https://localcoin.github.io/doxygen/classgraphene_1_1wallet_1_1wallet__api.html).
-If you want information which is not available from an API, it might be available
-from the [database](https://localcoin.github.io/doxygen/classgraphene_1_1chain_1_1database.html);
-it is fairly simple to write API methods to expose database methods.
-
 FAQ
 ---
 
@@ -207,7 +189,7 @@ FAQ
 
     The second number specifies the *type*.  The type of the object determines what fields it has.  For a
     complete list of type ID's, see `enum object_type` and `enum impl_object_type` in
-    [types.hpp](https://github.com/LocalCoinIS/LocalCoin-2/blob/localcoin/libraries/chain/include/graphene/chain/protocol/types.hpp).
+    [types.hpp](https://github.com/LocalCoinIS/LocalCoin-core/blob/master/libraries/chain/include/graphene/chain/protocol/types.hpp).
 
     The third number specifies the *instance*.  The instance of the object is different for each individual
     object.

check_unique_assets.php

@@ -245,6 +245,16 @@
                 ],
                 [
                     46, {}
+                ],
+                [
+                    47, {
+                      "fee": 1000000
+                    }
+                ],
+                [
+                    48, {
+                      "fee" : 100000
+                    }
                 ]
             ],
             "scale": 10000
@@ -269,6 +279,7 @@
         "cashback_vesting_threshold": 10000000,
         "count_non_member_votes": true,
         "allow_non_member_whitelists": false,
+        "activenode_pay_per_block": 6500,
         "witness_pay_per_block": 65000,
         "worker_budget_per_day": "30000000000",
         "max_predicate_opcode": 1,