Merge pull request iotaledger#1314 from iotaledger/develop

Merge v0.6.1 to master

CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.6.1 - 2021-05-19
+* Change Faucet default parameters
+* **Breaking**: bumps network and database versions
+
 # v0.6.0 - 2021-05-19
 * Add first iteration of the tokenization framework
 * Add aMana refresher

plugins/autopeering/discovery/parameters.go

@@ -5,7 +5,7 @@ import "github.com/iotaledger/hive.go/configuration"
 // Parameters contains the configuration parameters used by the message layer.
 var Parameters = struct {
 	// NetworkVersion defines the config flag of the network version.
-	NetworkVersion int `default:"28" usage:"autopeering network version"`
+	NetworkVersion int `default:"29" usage:"autopeering network version"`
 
 	// EntryNodes defines the config flag of the entry nodes.
 	EntryNodes []string `default:"[email protected]:15626,5EDH4uY78EA6wrBkHHAVBWBMDt7EcksRq6pjzipoW15B@entryshimmer.tanglebay.com:14646" usage:"list of trusted entry nodes for auto peering"`

plugins/banner/plugin.go

@@ -17,7 +17,7 @@ var (
 	once   sync.Once
 
 	// AppVersion version number
-	AppVersion = "v0.6.0"
+	AppVersion = "v0.6.1"
 	// SimplifiedAppVersion is the version number without commit hash
 	SimplifiedAppVersion = simplifiedVersion(AppVersion)
 )

plugins/database/versioning.go

@@ -11,7 +11,7 @@ import (
 const (
 	// DBVersion defines the version of the database schema this version of GoShimmer supports.
 	// Every time there's a breaking change regarding the stored data, this version flag should be adjusted.
-	DBVersion = 30
+	DBVersion = 31
 )
 
 var (

plugins/faucet/plugin.go

@@ -51,7 +51,7 @@ func init() {
 	flag.String(CfgFaucetSeed, "", "the base58 encoded seed of the faucet, must be defined if this faucet is enabled")
 	flag.Int(CfgFaucetTokensPerRequest, 1000000, "the amount of tokens the faucet should send for each request")
 	flag.Int(CfgFaucetMaxTransactionBookedAwaitTimeSeconds, 5, "the max amount of time for a funding transaction to become booked in the value layer")
-	flag.Int(CfgFaucetPoWDifficulty, 25, "defines the PoW difficulty for faucet payloads")
+	flag.Int(CfgFaucetPoWDifficulty, 22, "defines the PoW difficulty for faucet payloads")
 	flag.Int(CfgFaucetBlacklistCapacity, 10000, "holds the maximum amount the address blacklist holds")
 	flag.Int(CfgFaucetPreparedOutputsCount, 126, "number of outputs the faucet prepares")
 	flag.Int(CfgFaucetStartIndex, 0, "address index to start faucet with")