Merge branch 'master' into devel

Conflicts:
	release-notes.md
	scorex-basics/src/main/scala/scorex/wallet/Wallet.scala
	scorex-transaction/src/main/scala/scorex/transaction/state/database/blockchain/StoredBlockchain.scala
	scorex-transaction/src/test/scala/scorex/transaction/GenesisTransactionSpecification.scala
	version.sbt

Author: catena2w

docs/articles/private-chains.md

@@ -81,21 +81,21 @@ stated now: **One size doesn't fit all.**. I saw many trends in data storage and
  tool to work with. When we are talking about such a specific data storage as blockchain some questions 
  should be answered in prior. Here is example list: 
 
-    * How many participants will be in a network? Are they equal? Are all of them are allowed 
-     to change a global state(so to generate blocks)? 
+* How many participants will be in a network? Are they equal? Are all of them are allowed 
+  to change a global state(so to generate blocks)? 
 
-    * What load is planned? E.g. how many transactions per hour or day.                  
+* What load is planned? E.g. how many transactions per hour or day.                  
 
-    * Data model for global state(ledger) should be considered. Please note blockchain 
-    is replicated data structure, and there is no known work on how to shard it yet.
+* Data model for global state(ledger) should be considered. Please note blockchain 
+  is replicated data structure, and there is no known work on how to shard it yet.
 
-    * Could be state designed in a way to allow some form of pruning? 
+* Could be state designed in a way to allow some form of pruning? 
 
-    * Transaction model should be considered. How many bytes an average transaction is about? 
+* Transaction model should be considered. How many bytes an average transaction is about? 
 
-    * What are security requirements regarding consensus? What could be tolerated?
+* What are security requirements regarding consensus? What could be tolerated?
 
-    * What are privacy requirements? Should be all the data is visible for all? 
+* What are privacy requirements? Should be all the data is visible for all? 
 
 
 Conclusion
@@ -111,4 +111,4 @@ Appendix 1. The Scorex Project
 ------------------------------
 
 I am the author of the [Scorex project, minimalistic blockchain engine for research purposes](https://github.com/ScorexProject). I think Scorex would be useful for experiments with
-private blockchains.
+private blockchains.

release-notes.md

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 **1.2.8**
 ---------
 
@@ -12,12 +13,18 @@
 * Limits for /blocks/address/{address} API call added
 * Height added for /transactions/info/{signature} and /blocks/seq/{from}/{to} API methods
 
+=======
+>>>>>>> master
 **1.2.7**
 ---------
 
 * Unify bytes/json serialization/deserialization
+<<<<<<< HEAD
 * Blockchain and State databased were merged
 * Bugfixes
+=======
+* Blockchain and State database updates made atomic
+>>>>>>> master
 
 **1.2.6**
 ---------

scorex-basics/src/main/scala/scorex/api/http/swagger/SwaggerDocService.scala

@@ -20,7 +20,7 @@ class SwaggerDocService(system: ActorSystem, val apiTypes: Seq[Type], settings:
   override val apiDocsPath: String = "swagger"
 
   override val info: Info = Info("The Web Interface to the Scorex API",
-    "1.2.6",
+    "1.2.7",
     "Scorex API",
     "License: Creative Commons CC0",
     Some(Contact("Alex", "https://scorex-dev.groups.io/g/main", "alex.chepurnoy@iohk.io")),

scorex-transaction/src/main/scala/scorex/transaction/state/database/blockchain/StoredBlockchain.scala

@@ -16,8 +16,8 @@ import scala.collection.concurrent.TrieMap
 import scala.util.{Failure, Success, Try}
 
 /**
- * If no datafolder provided, blockchain lives in RAM (useful for tests)
- */
+  * If no datafolder provided, blockchain lives in RAM (useful for tests)
+  */
 class StoredBlockchain(db: MVStore)
                       (implicit consensusModule: ConsensusModule[_],
                        transactionModule: TransactionModule[_])

scorex-transaction/src/test/scala/scorex/transaction/GenesisTransactionSpecification.scala

@@ -21,13 +21,14 @@ class GenesisTransactionSpecification extends PropSpec with PropertyChecks with
   }
 
   property("GenesisTransaction parse from Bytes should work fine") {
+    val bytes = Base58.decode("y9KVfkMyuvik3koq45snK6vP27L12VdmuNSCVBvqPMsESvpDiUjT5dyb").get
+
+    val actualTransaction = GenesisTransaction.parseBytes(bytes.tail).get
+
     val balance = 149857264546L
     val timestamp = 4598723454L
     val expectedTransaction = new GenesisTransaction(defaultRecipient, balance, timestamp)
 
-    val bytes = Base58.decode("5GoidY2PcCc7ENdrcapZcmmdq2H57NuiXEdgVkpfnnzkB4o8R575WVR1Xw").get
-    val actualTransaction = GenesisTransaction.parseBytes(bytes).get
-
     actualTransaction should equal(expectedTransaction)
   }
 

src/test/resources/application.conf

@@ -1,6 +1,6 @@
 app {
   product = "Scorex"
   release = "Lagonaki"
-  version = "1.2.6"
+  version = "1.2.7"
   consensusAlgo = "nxt"
 }