Merge 0.26.0 back to develop (#2718)

* PENDING => CHANGELOG * Linkify changelog * Merge PR #2716: Temporarily disable gaia lite insecure mode * TODO: need to update CHANGELOG w/ import-export PR #2690
cosmos · Nov 9, 2018 · 02da397 · 02da397
1 parent 94f4531
commit 02da397
Show file tree

Hide file tree

Showing 3 changed files with 83 additions and 33 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,60 @@
 # Changelog
 
+## 0.26.0
+
+BREAKING CHANGES
+
+* Gaia
+  * [gaiad init] [\#2602](https://github.com/cosmos/cosmos-sdk/issues/2602) New genesis workflow
+
+* SDK
+  * [simulation] [\#2665](https://github.com/cosmos/cosmos-sdk/issues/2665) only argument to simulation.Invariant is now app
+
+* Tendermint
+  * Upgrade to version 0.26.0
+
+FEATURES
+
+* Gaia CLI  (`gaiacli`)
+  * [cli] [\#2569](https://github.com/cosmos/cosmos-sdk/pull/2569) Add commands to query validator unbondings and redelegations
+  * [cli] [\#2569](https://github.com/cosmos/cosmos-sdk/pull/2569) Add commands to query validator unbondings and redelegations
+  * [cli] [\#2524](https://github.com/cosmos/cosmos-sdk/issues/2524) Add support offline mode to `gaiacli tx sign`. Lookups are not performed if the flag `--offline` is on.
+  * [cli] [\#2558](https://github.com/cosmos/cosmos-sdk/issues/2558) Rename --print-sigs to --validate-signatures. It now performs a complete set of sanity checks and reports to the user. Also added --print-signature-only to print the signature only, not the whole transaction.
+
+* SDK
+  * [\#1336](https://github.com/cosmos/cosmos-sdk/issues/1336) Mechanism for SDK Users to configure their own Bech32 prefixes instead of using the default cosmos prefixes.
+
+IMPROVEMENTS
+
+* Gaia
+ * [\#2637](https://github.com/cosmos/cosmos-sdk/issues/2637) [x/gov] Switched inactive and active proposal queues to an iterator based queue
+
+* SDK
+ * [\#2573](https://github.com/cosmos/cosmos-sdk/issues/2573) [x/distribution] add accum invariance
+ * [\#2556](https://github.com/cosmos/cosmos-sdk/issues/2556) [x/mock/simulation] Fix debugging output
+ * [\#2396](https://github.com/cosmos/cosmos-sdk/issues/2396) [x/mock/simulation] Change parameters to get more slashes
+ * [\#2617](https://github.com/cosmos/cosmos-sdk/issues/2617) [x/mock/simulation] Randomize all genesis parameters
+ * [\#2669](https://github.com/cosmos/cosmos-sdk/issues/2669) [x/stake] Added invarant check to make sure validator's power aligns with its spot in the power store.
+ * [\#1924](https://github.com/cosmos/cosmos-sdk/issues/1924) [x/mock/simulation] Use a transition matrix for block size
+ * [\#2660](https://github.com/cosmos/cosmos-sdk/issues/2660) [x/mock/simulation] Staking transactions get tested far more frequently
+ * [\#2610](https://github.com/cosmos/cosmos-sdk/issues/2610) [x/stake] Block redelegation to and from the same validator
+ * [\#2652](https://github.com/cosmos/cosmos-sdk/issues/2652) [x/auth] Add benchmark for get and set account
+ * [\#2685](https://github.com/cosmos/cosmos-sdk/issues/2685) [store] Add general merkle absence proof (also for empty substores)
+ * [\#2708](https://github.com/cosmos/cosmos-sdk/issues/2708) [store] Disallow setting nil values
+
+BUG FIXES
+
+* Gaia
+ * [\#2670](https://github.com/cosmos/cosmos-sdk/issues/2670) [x/stake] fixed incorrect `IterateBondedValidators` and split into two functions: `IterateBondedValidators` and `IterateLastBlockConsValidators`
+ * [\#2691](https://github.com/cosmos/cosmos-sdk/issues/2691) Fix local testnet creation by using a single canonical genesis time
+
+* SDK
+ * [\#2625](https://github.com/cosmos/cosmos-sdk/issues/2625) [x/gov] fix AppendTag function usage error
+ * [\#2677](https://github.com/cosmos/cosmos-sdk/issues/2677) [x/stake, x/distribution] various staking/distribution fixes as found by the simulator
+ * [\#2674](https://github.com/cosmos/cosmos-sdk/issues/2674) [types] Fix coin.IsLT() impl, coins.IsLT() impl, and renamed coins.Is\* to coins.IsAll\* (see [\#2686](https://github.com/cosmos/cosmos-sdk/issues/2686))
+ * [\#2711](https://github.com/cosmos/cosmos-sdk/issues/2711) [x/stake] Add commission data to `MsgCreateValidator` signature bytes.
+ * Temporarily disable insecure mode for Gaia Lite
+
 ## 0.25.0
 
 *October 24th, 2018*

diff --git a/PENDING.md b/PENDING.md
@@ -7,23 +7,17 @@ BREAKING CHANGES
 * Gaia CLI  (`gaiacli`)
 
 * Gaia
-  * [gaiad init] \#2602 New genesis workflow
 
 * SDK
-  * [simulation] \#2665 only argument to simulation.Invariant is now app
 
 * Tendermint
-  * Upgrade to version 0.26.0
+
 
 FEATURES
 
 * Gaia REST API (`gaiacli advanced rest-server`)
 
 * Gaia CLI  (`gaiacli`)
-    * [cli] [\#2569](https://github.com/cosmos/cosmos-sdk/pull/2569) Add commands to query validator unbondings and redelegations
-    * [cli] [\#2569](https://github.com/cosmos/cosmos-sdk/pull/2569) Add commands to query validator unbondings and redelegations
-    * [cli] [\#2524](https://github.com/cosmos/cosmos-sdk/issues/2524) Add support offline mode to `gaiacli tx sign`. Lookups are not performed if the flag `--offline` is on.
-    * [cli] [\#2558](https://github.com/cosmos/cosmos-sdk/issues/2558) Rename --print-sigs to --validate-signatures. It now performs a complete set of sanity checks and reports to the user. Also added --print-signature-only to print the signature only, not the whole transaction.
 
 * Gaia
 
@@ -40,20 +34,8 @@ IMPROVEMENTS
 * Gaia CLI  (`gaiacli`)
 
 * Gaia
- - #2637 [x/gov] Switched inactive and active proposal queues to an iterator based queue
 
 * SDK
- - \#2573 [x/distribution] add accum invariance
- - \#2556 [x/mock/simulation] Fix debugging output
- - \#2396 [x/mock/simulation] Change parameters to get more slashes
- - \#2617 [x/mock/simulation] Randomize all genesis parameters
- - \#2669 [x/stake] Added invarant check to make sure validator's power aligns with its spot in the power store.
- - \#1924 [x/mock/simulation] Use a transition matrix for block size
- - \#2660 [x/mock/simulation] Staking transactions get tested far more frequently
- - \#2610 [x/stake] Block redelegation to and from the same validator
- - \#2652 [x/auth] Add benchmark for get and set account
- - \#2685 [store] Add general merkle absence proof (also for empty substores)
- - \#2708 [store] Disallow setting nil values
 
 * Tendermint
 
@@ -70,9 +52,5 @@ BUG FIXES
  - \#2691 Fix local testnet creation by using a single canonical genesis time
 
 * SDK
- - \#2625 [x/gov] fix AppendTag function usage error
- - \#2677 [x/stake, x/distribution] various staking/distribution fixes as found by the simulator
- - \#2674 [types] Fix coin.IsLT() impl, coins.IsLT() impl, and renamed coins.Is\* to coins.IsAll\* (see \#2686)
- - \#2711 [x/stake] Add commission data to `MsgCreateValidator` signature bytes.
 
 * Tendermint
diff --git a/client/lcd/root.go b/client/lcd/root.go
@@ -2,6 +2,11 @@ package lcd
 
 import (
 	"errors"
+	"fmt"
+	"net"
+	"net/http"
+	"os"
+
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/context"
 	"github.com/cosmos/cosmos-sdk/client/keys"
@@ -20,9 +25,6 @@ import (
 	"github.com/spf13/viper"
 	"github.com/tendermint/tendermint/libs/log"
 	tmserver "github.com/tendermint/tendermint/rpc/lib/server"
-	"net"
-	"net/http"
-	"os"
 )
 
 const (
@@ -46,7 +48,9 @@ func ServeCommand(cdc *codec.Codec) *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) (err error) {
 			listenAddr := viper.GetString(flagListenAddr)
 			handler := createHandler(cdc)
+
 			registerSwaggerUI(handler)
+
 			logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout)).With("module", "rest-server")
 			maxOpen := viper.GetInt(flagMaxOpenConnections)
 			sslHosts := viper.GetString(flagSSLHosts)
@@ -62,21 +66,28 @@ func ServeCommand(cdc *codec.Codec) *cobra.Command {
 			})
 
 			var cleanupFunc func()
+
+			// TODO: re-enable insecure mode once #2715 has been addressed
 			if viper.GetBool(flagInsecure) {
-				listener, err = tmserver.StartHTTPServer(
-					listenAddr, handler, logger,
-					tmserver.Config{MaxOpenConnections: maxOpen},
+				fmt.Println(
+					"Insecure mode is temporarily disabled, please locally generate an " +
+						"SSL certificate to test. Support will be re-enabled soon!",
 				)
-				if err != nil {
-					return
-				}
+				// listener, err = tmserver.StartHTTPServer(
+				// 	listenAddr, handler, logger,
+				// 	tmserver.Config{MaxOpenConnections: maxOpen},
+				// )
+				// if err != nil {
+				// 	return
+				// }
 			} else {
 				if certFile != "" {
 					// validateCertKeyFiles() is needed to work around tendermint/tendermint#2460
 					err = validateCertKeyFiles(certFile, keyFile)
 					if err != nil {
 						return err
 					}
+
 					//  cert/key pair is provided, read the fingerprint
 					fingerprint, err = fingerprintFromFile(certFile)
 					if err != nil {
@@ -88,10 +99,12 @@ func ServeCommand(cdc *codec.Codec) *cobra.Command {
 					if err != nil {
 						return err
 					}
+
 					cleanupFunc = func() {
 						os.Remove(certFile)
 						os.Remove(keyFile)
 					}
+
 					defer cleanupFunc()
 				}
 
@@ -104,9 +117,12 @@ func ServeCommand(cdc *codec.Codec) *cobra.Command {
 				if err != nil {
 					return
 				}
+
 				logger.Info(fingerprint)
+				logger.Info("REST server started")
 			}
-			logger.Info("REST server started")
+
+			// logger.Info("REST server started")
 
 			return nil
 		},
@@ -123,6 +139,7 @@ func ServeCommand(cdc *codec.Codec) *cobra.Command {
 	cmd.Flags().Int(flagMaxOpenConnections, 1000, "The number of maximum open connections")
 	cmd.Flags().Bool(client.FlagTrustNode, false, "Trust connected full node (don't verify proofs for responses)")
 	cmd.Flags().Bool(client.FlagIndentResponse, false, "Add indent to JSON response")
+
 	viper.BindPFlag(client.FlagTrustNode, cmd.Flags().Lookup(client.FlagTrustNode))
 	viper.BindPFlag(client.FlagChainID, cmd.Flags().Lookup(client.FlagChainID))
 	viper.BindPFlag(client.FlagNode, cmd.Flags().Lookup(client.FlagNode))