Merge branch 'develop' into cwgoes/simulation-transubstantiated

.github/CODEOWNERS

@@ -1,7 +1,7 @@
 # CODEOWNERS: https://help.github.com/articles/about-codeowners/
 
 # Primary repo maintainers
-*       @ebuchman @rigelrozanski @cwgoes
+*       @jaekwon
 
 # Precious documentation
 /docs/  @zramsay @jolesbi

Makefile

@@ -169,7 +169,7 @@ test_sim_gaia_nondeterminism:
 
 test_sim_gaia_fast:
 	@echo "Running quick Gaia simulation. This may take several minutes..."
-	@go test ./cmd/gaia/app -run TestFullGaiaSimulation -SimulationEnabled=true -SimulationNumBlocks=500 -SimulationBlockSize=200 -SimulationCommit=true -SimulationSeed=9 -v -timeout 24h
+	@go test ./cmd/gaia/app -run TestFullGaiaSimulation -SimulationEnabled=true -SimulationNumBlocks=500 -SimulationBlockSize=200 -SimulationCommit=true -SimulationSeed=10 -v -timeout 24h
 
 test_sim_gaia_multi_seed:
 	@echo "Running multi-seed Gaia simulation. This may take awhile!"

PENDING.md

@@ -9,6 +9,7 @@ BREAKING CHANGES
 * Gaia
 
 * SDK
+  * [simulation] \#2665 only argument to simulation.Invariant is now app
 
 * Tendermint
 
@@ -44,10 +45,11 @@ IMPROVEMENTS
  - #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
- - \#1924 [simulation] Use a transition matrix for block size
- - #2610 [x/stake] Block redelegation to and from the same validator
  - #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
 
 * Tendermint
 

client/keys/utils.go

@@ -96,7 +96,12 @@ func GetKeyBaseFromDirWithWritePerm(rootDir string) (keys.Keybase, error) {
 
 // GetKeyBaseFromDir initializes a read-only keybase at a particular dir.
 func GetKeyBaseFromDir(rootDir string) (keys.Keybase, error) {
-	return getKeyBaseFromDirWithOpts(rootDir, &opt.Options{ReadOnly: true})
+	// Disabled because of the inability to create a new keys database directory
+	// in the instance of when ReadOnly is set to true.
+	//
+	// ref: syndtr/goleveldb#240
+	// return getKeyBaseFromDirWithOpts(rootDir, &opt.Options{ReadOnly: true})
+	return getKeyBaseFromDirWithOpts(rootDir, nil)
 }
 
 func getKeyBaseFromDirWithOpts(rootDir string, o *opt.Options) (keys.Keybase, error) {

client/lcd/certificates.go

@@ -38,6 +38,7 @@ func generateSelfSignedCert(host string) (certBytes []byte, priv *ecdsa.PrivateK
 		Subject: pkix.Name{
 			Organization: []string{"Gaia Lite"},
 		},
+		DNSNames:              []string{"localhost"},
 		NotBefore:             notBefore,
 		NotAfter:              notAfter,
 		KeyUsage:              x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,

client/lcd/certificates_test.go

@@ -17,7 +17,7 @@ func TestGenerateSelfSignedCert(t *testing.T) {
 	cert, err := x509.ParseCertificate(certBytes)
 	require.Nil(t, err)
 	require.Equal(t, 2, len(cert.IPAddresses))
-	require.Equal(t, 1, len(cert.DNSNames))
+	require.Equal(t, 2, len(cert.DNSNames))
 	require.True(t, cert.IsCA)
 }
 

client/lcd/root.go

@@ -2,16 +2,13 @@ package lcd
 
 import (
 	"errors"
-	"net"
-	"net/http"
-	"os"
-
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/context"
 	"github.com/cosmos/cosmos-sdk/client/keys"
 	"github.com/cosmos/cosmos-sdk/client/rpc"
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	"github.com/cosmos/cosmos-sdk/codec"
+	"github.com/cosmos/cosmos-sdk/server"
 	auth "github.com/cosmos/cosmos-sdk/x/auth/client/rest"
 	bank "github.com/cosmos/cosmos-sdk/x/bank/client/rest"
 	gov "github.com/cosmos/cosmos-sdk/x/gov/client/rest"
@@ -21,9 +18,11 @@ import (
 	"github.com/rakyll/statik/fs"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	cmn "github.com/tendermint/tendermint/libs/common"
 	"github.com/tendermint/tendermint/libs/log"
 	tmserver "github.com/tendermint/tendermint/rpc/lib/server"
+	"net"
+	"net/http"
+	"os"
 )
 
 const (
@@ -53,10 +52,16 @@ func ServeCommand(cdc *codec.Codec) *cobra.Command {
 			sslHosts := viper.GetString(flagSSLHosts)
 			certFile := viper.GetString(flagSSLCertFile)
 			keyFile := viper.GetString(flagSSLKeyFile)
-			cleanupFunc := func() {}
 
 			var listener net.Listener
 			var fingerprint string
+
+			server.TrapSignal(func() {
+				err := listener.Close()
+				logger.Error("error closing listener", "err", err)
+			})
+
+			var cleanupFunc func()
 			if viper.GetBool(flagInsecure) {
 				listener, err = tmserver.StartHTTPServer(
 					listenAddr, handler, logger,
@@ -89,6 +94,7 @@ func ServeCommand(cdc *codec.Codec) *cobra.Command {
 					}
 					defer cleanupFunc()
 				}
+
 				listener, err = tmserver.StartHTTPAndTLSServer(
 					listenAddr, handler,
 					certFile, keyFile,
@@ -102,13 +108,6 @@ func ServeCommand(cdc *codec.Codec) *cobra.Command {
 			}
 			logger.Info("REST server started")
 
-			// wait forever and cleanup
-			cmn.TrapSignal(func() {
-				defer cleanupFunc()
-				err := listener.Close()
-				logger.Error("error closing listener", "err", err)
-			})
-
 			return nil
 		},
 	}

docs/.vuepress/config.js

@@ -72,8 +72,8 @@ module.exports = {
         title: "Light Client",
         collapsable: false,
         children: [
-	  "/light/",
-	  "/light/getting_started"
+	  "/lite/",
+	  "/lite/getting_started"
 	]
       },
       {