From 45c32f45ef1ec7207fe6dc9063a032b8d0b54227 Mon Sep 17 00:00:00 2001 From: Alexey Kiselev Date: Wed, 22 Feb 2017 18:52:06 +0300 Subject: [PATCH] DEB packaging was fixed to process new configuration file. Warning message was added in case of no configuration file provided. --- pack.sbt | 11 +- release-notes.md | 162 +----------------- src/main/resources/reference.conf | 2 +- .../scala/com/wavesplatform/Application.scala | 2 + 4 files changed, 15 insertions(+), 162 deletions(-) diff --git a/pack.sbt b/pack.sbt index 93c1fb2815f..76d2975e4d0 100644 --- a/pack.sbt +++ b/pack.sbt @@ -68,7 +68,7 @@ val commonSettings: Seq[Setting[_]] = Seq( packageJarTask ) -import NativePackagerHelper._ +import com.typesafe.sbt.SbtNativePackager.autoImport.NativePackagerHelper._ val debianSettings = Seq( maintainer in Linux := "wavesplatform.com", @@ -87,17 +87,18 @@ val debianSettings = Seq( DebianConstants.Postinst -> s""" |mkdir -p /home/${packageName.value} && - |mkdir -p /home/${packageName.value}/wallet && - |mkdir -p /home/${packageName.value}/data && |(mv -n /usr/share/${packageName.value}/settings.conf /etc/${packageName.value}.conf 2>/dev/null || (rm -f /usr/share/${packageName.value}/settings.conf && cp -n /usr/share/${packageName.value}/settings.conf.default /etc/${packageName.value}.conf)) && - |ln -s /etc/${packageName.value}.conf /usr/share/${packageName.value}/settings.conf && + |ln -sv /etc/${packageName.value}.conf /usr/share/${packageName.value}/settings.conf && |chmod -R 750 /home/${packageName.value} && |chmod -R 750 /usr/share/${packageName.value} && |chmod -R 750 /etc/${packageName.value} && |chmod 750 /etc/${packageName.value}.conf && |chown -R ${packageName.value}:${packageName.value} /etc/${packageName.value}.conf && |chown -R ${packageName.value}:${packageName.value} /usr/share/${packageName.value} && - |chown -R ${packageName.value}:${packageName.value} /home/${packageName.value}""".stripMargin), + |chown -R ${packageName.value}:${packageName.value} /home/${packageName.value} && + |test -f /etc/${packageName.value}.json && + |java -cp "/usr/share/${packageName.value}/lib/*" com.wavesplatform.settings.LegacyConfigTransformer /etc/${packageName.value}.json > /etc/${packageName.value}.conf && + |rm -f /etc/${packageName.value}.json}""".stripMargin), debianPackageDependencies in Debian += "java8-runtime-headless", mappings in Universal ++= { if (network == "mainnet") { diff --git a/release-notes.md b/release-notes.md index 6c8bd151b7d..e8b9c539730 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,3 +1,9 @@ +**0.6.0** + +* The DEX's Order Match transaction has been changed. This is the main reason for restarting Testnet. Now, a second asset of transaction's pair is used to set an amount of the transaction. +* LPOS was implemented. New Leasing and Leasing Cancel transactions were added. +* New, HOCON based, configuration file. Old configuration file (JSON based) is supported in this release for backward compatibility. Automatic configuration file conversion added to DEB packages. + **0.3.2** * By default walletDir and dataDir located in $HOME/waves @@ -59,159 +65,3 @@ **0.1.2** * Upgrade to Scorex 1.2.4. Clean /scorex/waves/data/ before run. - - -Scorex Release Notes: - - -**v1.4.1** ----------- - -* Upgrade to swagger-ui-2.2.5 - -**v1.3.3** ----------- - -* AddressScheme added for ChainID injection. -* New Blockchain synchronization algo -* Fixed invalid CORS headers in HTTP API - -**v1.3.2** ----------- - -* peers.dat format changed. Remove old peers.dat. -* Random unconfirmed tx rebroadcast to network periodically - (utxRebroadcastInterval seconds in settings.json) -* If peer receive new unconfirmed tx, will broadcast it to network. - -**v1.3.1** ----------- - -* Peers blacklist ttl configuration via "p2p"/"blacklistResidenceTimeMilliseconds" - -**1.2.8** ---------- - -* Performance updates -* Make hash functions configurable via application.conf -* RPC address become configurable via settings.json -* One more byte added to address to identify the network -* Max difference between transaction and block timestamps added -* Balance with confirmations is now minimum during this period -* NXT consensus algorithm fixes -* api_key protection for wallet/seed and addresses/seed API methods added -* Limits for /blocks/address/{address} API call added -* Height added for /transactions/info/{signature} and /blocks/seq/{from}/{to} API methods -* "p2p"/"fuzzingDelay" setting via settings.json in order to emulate message delays - -**1.2.7** ---------- - -* Unify bytes/json serialization/deserialization -* Blockchain and State databased were merged -* Bugfixes -* Blockchain and State database updates made atomic - -**1.2.6** ---------- - -* api_key authentication support for API implemented -* api_key is required for all POST and DELETE requests -* SeedApiRoute was renamed to UtilsApiRoute -* New API calls /utils/hash/secure and /utils/hash/fast -* Fixed API call /peers/connect - -**1.2.5** ---------- - -* Changed response format for /addresses, /block/address/{address} and /transactions/unconfirmed API calls -* API routes migrated from spray to akka-http -* A bug with a block containing a plenty of transactions has been fixed -* Issues #78 and #75 fixed - -**1.2.4** ---------- - -* New API calls /transactions/info and /peers/connect -* MVStore is used for state persistence -* Fixed JSON styling in API call results - -**1.2.3** ---------- - -* Peer blacklisting implemented -* Logback configured to rollover log files daily -* MapDB has been replaced with MVStore - -**1.2.2** ---------- - -* LagonakiApplication was extracted into [Lagonaki](https://github.com/ScorexProject/Lagonaki) project -* New API call /addresses/seq -* API call /blocks/seq fixed -* Disk-based persistence for peers whitelist/blacklist - -**1.2.1** ---------- - -* New API call /blocks/seq -* CORS optional support(to be allowed in settings, disallowed by default) - -**1.2.0** ---------- - -* Web interface to core API has been added. Please set "rpcport" value in settings.json then visit - http://localhost:{rpcport}/ after server bootstrapping. -* Permacoin implementation has been added. Permacoin is blockchain consensus protocol based on -non-interactive Proof-of-Retrievability of a static dataset by A. Miller, E. Shi, J. Katz, B. Parno et at. - For details please see the paper http://cs.umd.edu/~amiller/permacoin.pdf . Protocol settings could be changed - in perma.conf. -* For Permacoin module, new API calls are /consensus/target, /consensus/target/{blockId}, - /consensus/puz, /consensus/puz/{blockId} . -* P2P layer is totally rewritten. From now a new module can implement messages and messages handling -logic separately. Then module p2p logic is to be wired into application's logic. -* UPnP ports mapping -* TCP packets assembling (Akka I/O missing) -* Experimental: a node could store a blocktree explicitly. Storage type could be changed via "history" -setting(set "blockchain" / "blocktree"). Different nodes can have different storage types. -* New class of API calls, starting with debug/ -* peers/ API call has been renamed into peers/connected, peers/all has been added - - -**1.1.2** ---------- - -* API call added: consensus/algo -* API calls added for Qora-like consensus algo: consensus/time, consensus/time/{generatingBalance}, - consensus/generatingbalance, consensus/generatingbalance/{blockId} -* API calls added for Nxt-like consensus algo: consensus/basetarget, consensus/basetarget/{blockId}, - consensus/generationsignature, consensus/generationsignature/{blockId} - -**1.1.1** ---------- - -* API call added: addresses/sign -* API call added: addresses/create -* API call added: DELETE to addresses/address/{address} -* Less buggy blockchain synchronization logic - - -**1.1.0** ----------- - -* Modular design: basics, consensus, transaction modules are extracted -* Ping messages removed -* Docker container - - -**1.0.4** ---------- - -* Scorex-crypto module has been extracted as the separate sub-project - - -**1.0.3** ---------- - -* This file has been started :) -* SBT commands instead of linux shell scripts diff --git a/src/main/resources/reference.conf b/src/main/resources/reference.conf index 7aacb07178b..f631f0731c7 100644 --- a/src/main/resources/reference.conf +++ b/src/main/resources/reference.conf @@ -1,5 +1,5 @@ app { product = "Waves" release = "Release0" - version = "0.5.1-SNAPSHOT" + version = "0.6.0" } diff --git a/src/main/scala/com/wavesplatform/Application.scala b/src/main/scala/com/wavesplatform/Application.scala index 6de871819e6..83abe4e29ce 100644 --- a/src/main/scala/com/wavesplatform/Application.scala +++ b/src/main/scala/com/wavesplatform/Application.scala @@ -103,6 +103,8 @@ object Application extends ScorexLogging { if file.exists } yield file + if (maybeConfigFile.isEmpty) log.warn("NO CONFIGURATION FILE WAS PROVIDED. STARTING WITH DEFAULT SETTINGS FOR TESTNET!") + val maybeUserConfig = maybeConfigFile collect { case file if file.getName.endsWith(".json") => log.warn("JSON configuration file is deprecated and will be removed in the future version. " +