merge from https://gitlab.burst-team.us

.gitignore

@@ -0,0 +1,11 @@
+/*.iml
+/dist
+/.idea
+burst.jar
+burst_test_db
+burst_db
+nxt.log
+/conf/logging.properties
+/conf/nxt.properties
+nxt.log.lck
+

README.md

@@ -1,2 +1,111 @@
-burstcoin
-=========
+# Info 
+
+Please visit https://github.com/PoC-Consortium/burstcoin for the designated successor and current development version. 
+
+# Burstcoin
+
+The world's first HDD-mined cryptocurrency using the new algorithm, Proof-of-Capacity.
+
+## Striking Features
+
+- Proof of Capacity - ASIC Proof / Energy efficient mining
+- Fast sync. with multithread CPU or OpenCL/GPU (optional)
+- "Turing complete" smart contracts, via Automated Transactions (AT) https://ciyam.org/at/at.html
+- Decentralized Crowdfunding and Lottery via AT
+- Asset Exchange and Digital Goods Store
+- Advanced transactions: Escrow and Subscription
+- Encrypted Messaging
+
+## Specification
+
+- NXT based
+- Proof of Stake Removed
+- Proof of Capacity implemented
+- No IPO
+- No Premine
+- 4 minute block time
+- 2,158,812,800 coins total
+- Block reward starts at 10,000/block
+- Block Reward Decreases at 5% each month
+
+## Version History
+
+- 2017/07/25 New version release Burst 1.2.9
+- 2017/02/19 New version release Burst 1.2.8
+- 2016/11/16 New version release Burst 1.2.7
+- 2016/07/27 New version release Burst 1.2.6
+- 2016/07/19 New version release Burst 1.2.5
+- 2016/06/07 New version release Burst 1.2.4            
+- 2016/01/11 Community takeover
+- 2015/04/20 New version release Burst 1.2.3
+- 2015/02/05 New version release Burst 1.2.2
+- 2015/01/20 New version release Burst 1.2.1
+- 2014/12/22 New version release Burst 1.2.0
+- 2014/11/04 New version release 1.1.5
+- 2014/10/18 New version release 1.1.4
+- 2014/10/04 Escrow transactions enabled
+- 2014/09/27 New version release 1.1.3
+- 2014/09/14 New version release 1.1.2
+- 2014/09/13 Stuck transactions statement
+- 2014/09/13 New version release 1.1.1
+- 2014/09/09 New version release 1.1.0
+- 2014/08/31 V2 mining pool now up
+- 2014/08/27 New version release 1.0.3
+- 2014/08/20 First pool (v1) now up
+- 2014/08/17 New version release 1.0.2
+- 2014/08/16 Statement regarding the difficulty adjustment
+- 2014/08/11 Statement regarding The pool situation
+
+## Build
+
+Burstcoin can be build using maven or the compile scripts within this repository.
+
+## Links
+
+For further information, please visit the following pages.
+
+### Home
+https://web.burst-team.us
+
+### Block-Explorer
+http://burstcoin.biz
+
+### Forum
+https://forums.burst-team.us
+
+### Bitcointalk
+https://bitcointalk.org/index.php?topic=1541310 *(New unmoderated)*
+
+https://bitcointalk.org/index.php?topic=1323657 *(Alternative moderated)*
+
+https://bitcointalk.org/index.php?topic=731923 *(Original unmoderated)*
+
+### Related repositories
+https://github.com/BurstProject *Original/Forked Burstcoin, ATDebugger, ATAssembler, POCMiner (Proof of concept plotter/miner), etc.*
+
+https://github.com/IceBurst/Burst *Burst for Android*
+
+https://github.com/dawallet/ *Burstcoin Win Client, Android App*
+
+https://github.com/Blagodarenko  *Blago's XPlotter, Windows Miner, PlotsChecker, etc.*
+
+https://github.com/de-luxe *GPU assisted jMiner, Faucet Software, Observer, AddressGenerator*
+
+https://github.com/Creepsky/creepMiner *C++ Crossplatform Miner*
+
+https://github.com/BurstTools/BurstSoftware *Windows Plot Generator for SEE4/AVX2*
+
+https://github.com/bhamon *gpuPlotGenerator, BurstMine (graphical plotter/miner)*
+
+https://github.com/kartojal *GUI for Dcct Tools, GUI for gpuPlotGenerator (linux)*
+
+https://github.com/Kurairaito *Burst Plot Generator by Kurairaito*
+
+https://github.com/Mirkic7 *Improved Linux Burst Plotter / optimizer / miner (linux)*
+
+https://github.com/uraymeiviar *C Miner, Pool, Block Explorer, Plot Composer (linux)*
+
+https://github.com/mrpsion/burst-mining-system *Web interface for Plotting and Mining*
+
+### Additional Software
+https://forums.burst-team.us/category/9/burst-software

Readme.txt

@@ -1,7 +1,7 @@
-Burst ver 1.0.0
+Burst ver 1.2.9
 
 Requirements:
-Java 7 compatible JVM
+Java 8 compatible JVM
 
 Setup:
 Before you do anything, sync your clock.  Burst uses your computer clock's time, and having the time off too much could cause you to reject legit blocks, or miss out on blocks you could have mined. On linux "sudo ntpd -gq", on windows go to change date/time, and go to internet time and tell it to sync with a time server.

conf/nxt-default.properties

@@ -1,3 +1,9 @@
+############################################################
+# Do not modify this file.  Instead, create a              #
+# nxt.properties file and make your changes there.         #
+# They will overwrite the defaults!                        #
+############################################################
+
 #### PEER NETWORKING ####
 
 # Announce my IP address/hostname to peers and allow them to share it with other peers.
@@ -24,7 +30,14 @@ nxt.myHallmark=
 
 # A list of well known peer addresses / host names, separated by '; '.
 # If not set, a random selection of nxtcrypto.org and nxtbase.com nodes is used.
-nxt.wellKnownPeers=198.199.103.145; 178.62.39.204; burst.cryptoport.io; 192.155.252.202; 37.58.107.74; 119.81.165.138; 119.81.44.170; 119.81.44.171
+nxt.wellKnownPeers=192.99.183.10; 18.116.7.200; 84.249.20.155; 45.58.62.236; 210.54.33.230; 203.167.243.44; 210.115.228.231; 171.98.174.125; 38.114.101.88; 38.114.101.87; 158.69.53.36; 176.9.25.254; 5.104.175.156; 5.104.175.157; 37.97.40.203; 192.99.47.76; 87.167.177.45; 5.9.124.68; 1.179.201.220; 75.158.125.140; 160.36.130.180; 178.136.98.153; 5.104.175.162; 91.121.159.44; 203.59.236.69; 5.9.119.180; 70.95.197.163; 88.99.249.245; 89.179.240.131; 126.124.211.226; 92.81.73.43; 178.63.87.215; 211.218.247.79; 71.166.55.129; 5.104.175.152; 5.104.175.154; 162.236.93.205; 75.189.195.82; 5.104.175.134; 5.104.175.137; 5.104.175.138; 107.141.2.251; 137.248.121.73; 88.106.222.81; 204.45.61.2; 85.217.171.59; 184.161.232.180; 213.113.246.35; 38.114.101.90; 188.2.144.168; 137.248.122.195; 162.243.144.202; 199.189.85.178; 111.90.145.100; 218.38.28.183; 5.104.175.11; 203.158.118.10; 151.80.42.137; 103.76.180.145; 88.99.166.52; 24.160.75.65; 198.27.68.159; 62.75.187.160; 91.189.160.214; 5.104.175.131; 73.169.38.202; 78.46.37.137; 103.251.107.78; 62.224.96.21; 95.165.143.249; 5.153.225.55; 5.189.165.186; 210.115.227.99; 213.136.69.222; 81.94.202.156; 81.83.5.50; 89.106.1.126; 77.120.101.95; 93.123.73.133; 202.5.195.252; 35.187.253.145; 77.120.101.180; 216.165.179.49; 162.248.4.26; 85.10.211.130; 192.161.209.104; 185.144.131.131; 2.81.168.154; 112.167.81.44; 86.19.102.12; 211.104.175.60; 87.98.145.132; 174.36.0.110; 88.115.127.46; 128.171.53.34; 173.238.248.170; 5.104.175.110; 90.126.120.47; 5.104.175.211; 37.120.185.33; 46.4.126.236; 108.238.244.144; 5.104.175.214; 112.161.84.93; 39.117.137.191; 5.9.106.250; 176.9.43.13; 67.68.14.47; 151.80.16.34; 223.19.255.106; 
+
+# These peers will always be sent rebroadcast transactions. They are also automatically added to wellKnownPeers, so no need for duplicates.
+burst.rebroadcastPeers=a.storj.eu; 158.69.150.192
+
+# Connect to this many well known peers before using the peer database to get connected faster.
+# Set to 0 or comment out to disable.
+burst.connectWellKnownFirst=10
 
 # Known bad peers to be blacklisted
 nxt.knownBlacklistedPeers=
@@ -91,6 +104,17 @@ nxt.isOffline=false
 # risk of revealing that this node is the submitter of such re-broadcasted new transactions.
 nxt.enableTransactionRebroadcasting=true
 
+# Do not allow the number of unconfirmed transactions in memory to exceed this value.
+# If exceeded, the fee/size ratio of the transactions in a forged block is used to
+# decide which to keep in the unconfirmed pool. Set to 0 or negative for no limit.
+nxt.maxUnconfirmedTransactions=400
+
+# Transactions that aren't confirmed for this many blocks start getting rebroadcast.
+burst.rebroadcastAfter=5
+
+# Transactions being rebroadcast get rebroadcast every this many blocks until they are confirmed.
+burst.rebroadcastEvery=4
+
 #### API SERVER ####
 
 # Accept http/json API requests.
@@ -205,10 +229,10 @@ nxt.debugLogUnconfirmed=false
 # Database connection JDBC url, see the H2 documentation for possible customizations.
 # Append ;AUTO_SERVER=TRUE to enable automatic mixed mode access.
 # The nxt_db folder is expected to be in the current working directory, will be created if missing.
-nxt.dbUrl=jdbc:h2:burst_db/burst;DB_CLOSE_ON_EXIT=FALSE
+nxt.dbUrl=jdbc:h2:./burst_db/burst;DB_CLOSE_ON_EXIT=FALSE
 
 # Database connection JDBC url to use with the test network, if isTestnet=true
-nxt.testDbUrl=jdbc:h2:burst_test_db/burst;DB_CLOSE_ON_EXIT=FALSE
+nxt.testDbUrl=jdbc:h2:./burst_test_db/burst;DB_CLOSE_ON_EXIT=FALSE
 
 # Database connection timeout in seconds.
 nxt.dbLoginTimeout=70
@@ -261,3 +285,15 @@ nxt.maxRollback=1440
 # Enable API requests used for blockchain and database manipulation.
 nxt.enableDebugAPI=false
 
+# Debug option for Testnet: Winning with every Deadline
+burst.mockMining = false
+
+# GPU Blocksync Acceleration / experimental !
+burst.oclAuto=true
+burst.oclVerify=false
+
+# If 'burst.oclAuto=false' gpu must be specified
+burst.oclPlatform=0
+burst.oclDevice=0
+burst.oclMemPercent=50
+burst.oclHashesPerEnqueue=1000