WIP: Jae/simulator improvements

Gopkg.toml

@@ -32,11 +32,11 @@
 
 [[override]]
   name = "github.com/tendermint/iavl"
-  version = "=v0.11.1"
+  branch = "jae/reverseiterator"
 
 [[override]]
   name = "github.com/tendermint/tendermint"
-  version = "v0.26.1"
+  branch = "jae/reverseiterator"
 
 ## deps without releases:
 

baseapp/baseapp.go

@@ -56,6 +56,7 @@ type BaseApp struct {
 	endBlocker       sdk.EndBlocker   // logic to run after all txs, and to determine valset changes
 	addrPeerFilter   sdk.PeerFilter   // filter peers by address and port
 	pubkeyPeerFilter sdk.PeerFilter   // filter peers by public key
+	simulationMode   bool             // if true, MountStoresIAVL uses MountStoresDB for speed.
 
 	//--------------------
 	// Volatile
@@ -86,13 +87,14 @@ var _ abci.Application = (*BaseApp)(nil)
 // Accepts variable number of option functions, which act on the BaseApp to set configuration choices
 func NewBaseApp(name string, logger log.Logger, db dbm.DB, txDecoder sdk.TxDecoder, options ...func(*BaseApp)) *BaseApp {
 	app := &BaseApp{
-		Logger:      logger,
-		name:        name,
-		db:          db,
-		cms:         store.NewCommitMultiStore(db),
-		router:      NewRouter(),
-		queryRouter: NewQueryRouter(),
-		txDecoder:   txDecoder,
+		Logger:         logger,
+		name:           name,
+		db:             db,
+		cms:            store.NewCommitMultiStore(db),
+		router:         NewRouter(),
+		queryRouter:    NewQueryRouter(),
+		txDecoder:      txDecoder,
+		simulationMode: false,
 	}
 	for _, option := range options {
 		option(app)
@@ -114,7 +116,13 @@ func (app *BaseApp) SetCommitMultiStoreTracer(w io.Writer) {
 // Mount IAVL stores to the provided keys in the BaseApp multistore
 func (app *BaseApp) MountStoresIAVL(keys ...*sdk.KVStoreKey) {
 	for _, key := range keys {
-		app.MountStore(key, sdk.StoreTypeIAVL)
+		if !app.simulationMode {
+			app.MountStore(key, sdk.StoreTypeIAVL)
+		} else {
+			// StoreTypeDB doesn't do anything upon commit, and it doesn't
+			// retain history, but it's useful for faster simulation.
+			app.MountStore(key, sdk.StoreTypeDB)
+		}
 	}
 }
 

baseapp/options.go

@@ -102,6 +102,16 @@ func (app *BaseApp) SetPubKeyPeerFilter(pf sdk.PeerFilter) {
 	app.pubkeyPeerFilter = pf
 }
 
+func (app *BaseApp) SetSimulationMode() {
+	if app.sealed {
+		panic("SetSimulationMode() on sealed BaseApp")
+	}
+	app.simulationMode = true
+}
+
+//----------------------------------------
+// TODO: move these out of this file?
+
 func (app *BaseApp) Router() Router {
 	if app.sealed {
 		panic("Router() on sealed BaseApp")

client/lcd/root.go

@@ -18,7 +18,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"github.com/tendermint/tendermint/libs/log"
-	tmserver "github.com/tendermint/tendermint/rpc/lib/server"
+	rpcserver "github.com/tendermint/tendermint/rpc/lib/server"
 
 	// Import statik for light client stuff
 	_ "github.com/cosmos/cosmos-sdk/client/lcd/statik"
@@ -87,9 +87,9 @@ func (rs *RestServer) Start(listenAddr string, sslHosts string,
 			"Insecure mode is temporarily disabled, please locally generate an " +
 				"SSL certificate to test. Support will be re-enabled soon!",
 		)
-		// listener, err = tmserver.StartHTTPServer(
+		// listener, err = rpcserver.StartHTTPServer(
 		// 	listenAddr, handler, logger,
-		// 	tmserver.Config{MaxOpenConnections: maxOpen},
+		// 	rpcserver.Config{MaxOpenConnections: maxOpen},
 		// )
 		// if err != nil {
 		// 	return
@@ -120,16 +120,19 @@ func (rs *RestServer) Start(listenAddr string, sslHosts string,
 			}()
 		}
 
-		rs.listener, err = tmserver.StartHTTPAndTLSServer(
-			listenAddr, rs.Mux,
-			certFile, keyFile,
-			rs.log,
-			tmserver.Config{MaxOpenConnections: maxOpen},
+		rs.listener, err = rpcserver.Listen(
+			listenAddr,
+			rpcserver.Config{MaxOpenConnections: maxOpen},
 		)
 		if err != nil {
 			return
 		}
-
+		go rpcserver.StartHTTPAndTLSServer(
+			rs.listener,
+			rs.Mux,
+			certFile, keyFile,
+			rs.log,
+		)
 		rs.log.Info(rs.fingerprint)
 		rs.log.Info("REST server started")
 	}

client/lcd/test_helpers.go

@@ -360,13 +360,16 @@ func startTM(
 }
 
 // startLCD starts the LCD.
-//
-// NOTE: This causes the thread to block.
 func startLCD(logger log.Logger, listenAddr string, cdc *codec.Codec, t *testing.T) (net.Listener, error) {
 	rs := NewRestServer(cdc)
 	rs.setKeybase(GetTestKeyBase(t))
 	registerRoutes(rs)
-	return tmrpc.StartHTTPServer(listenAddr, rs.Mux, logger, tmrpc.Config{})
+	listener, err := tmrpc.Listen(listenAddr, tmrpc.Config{})
+	if err != nil {
+		return nil, err
+	}
+	go tmrpc.StartHTTPServer(listener, rs.Mux, logger)
+	return listener, nil
 }
 
 // NOTE: If making updates here also update cmd/gaia/cmd/gaiacli/main.go

cmd/gaia/app/app.go

@@ -188,14 +188,20 @@ func MakeCodec() *codec.Codec {
 
 // application updates every end block
 func (app *GaiaApp) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) abci.ResponseBeginBlock {
-	tags := slashing.BeginBlocker(ctx, req, app.slashingKeeper)
 
 	// distribute rewards from previous block
 	distr.BeginBlocker(ctx, req, app.distrKeeper)
 
 	// mint new tokens for this new block
 	mint.BeginBlocker(ctx, app.mintKeeper)
 
+	// slash anyone who double signed.
+	// NOTE: This should happen after distr.BeginBlocker so that
+	// there is nothing left over in the validator fee pool,
+	// so as to keep the CanWithdrawInvariant invariant.
+	// TODO: This should really happen at EndBlocker.
+	tags := slashing.BeginBlocker(ctx, req, app.slashingKeeper)
+
 	return abci.ResponseBeginBlock{
 		Tags: tags.ToKVPairs(),
 	}