Merge branch 'master' into cwgoes/a-random-walk-down-proof-of-stake

types/rational.go

@@ -252,3 +252,11 @@ func RatsEqual(r1s, r2s []Rat) bool {
 func RatEq(t *testing.T, exp, got Rat) (*testing.T, bool, string, Rat, Rat) {
 	return t, exp.Equal(got), "expected:\t%v\ngot:\t\t%v", exp, got
 }
+
+// minimum rational between two
+func MinRat(r1, r2 Rat) Rat {
+	if r1.LT(r2) {
+		return r1
+	}
+	return r2
+}

types/stake.go

@@ -26,10 +26,15 @@ func BondStatusToString(b BondStatus) string {
 	case 0x02:
 		return "Bonded"
 	default:
-		return ""
+		panic("improper use of BondStatusToString")
 	}
 }
 
+// nolint
+func (b BondStatus) Equal(b2 BondStatus) bool {
+	return byte(b) == byte(b2)
+}
+
 // validator for a delegated proof of stake system
 type Validator interface {
 	GetRevoked() bool         // whether the validator is revoked

types/store.go

@@ -2,6 +2,7 @@ package types
 
 import (
 	"fmt"
+	"io"
 
 	abci "github.com/tendermint/tendermint/abci/types"
 	cmn "github.com/tendermint/tendermint/libs/common"
@@ -10,6 +11,20 @@ import (
 
 // NOTE: These are implemented in cosmos-sdk/store.
 
+// PruningStrategy specfies how old states will be deleted over time
+type PruningStrategy uint8
+
+const (
+	// PruneSyncable means only those states not needed for state syncing will be deleted (keeps last 100 + every 10000th)
+	PruneSyncable PruningStrategy = iota
+
+	// PruneEverything means all saved states will be deleted, storing only the current state
+	PruneEverything PruningStrategy = iota
+
+	// PruneNothing means all historic states will be saved, nothing will be deleted
+	PruneNothing PruningStrategy = iota
+)
+
 type Store interface { //nolint
 	GetStoreType() StoreType
 	CacheWrapper
@@ -19,6 +34,7 @@ type Store interface { //nolint
 type Committer interface {
 	Commit() CommitID
 	LastCommitID() CommitID
+	SetPruning(PruningStrategy)
 }
 
 // Stores of MultiStore must implement CommitStore.
@@ -50,6 +66,21 @@ type MultiStore interface { //nolint
 	GetStore(StoreKey) Store
 	GetKVStore(StoreKey) KVStore
 	GetKVStoreWithGas(GasMeter, StoreKey) KVStore
+
+	// TracingEnabled returns if tracing is enabled for the MultiStore.
+	TracingEnabled() bool
+
+	// WithTracer sets the tracer for the MultiStore that the underlying
+	// stores will utilize to trace operations. A MultiStore is returned.
+	WithTracer(w io.Writer) MultiStore
+
+	// WithTracingContext sets the tracing context for a MultiStore. It is
+	// implied that the caller should update the context when necessary between
+	// tracing operations. A MultiStore is returned.
+	WithTracingContext(TraceContext) MultiStore
+
+	// ResetTraceContext resets the current tracing context.
+	ResetTraceContext() MultiStore
 }
 
 // From MultiStore.CacheMultiStore()....
@@ -163,25 +194,27 @@ type KVStoreGetter interface {
 //----------------------------------------
 // CacheWrap
 
-/*
-	CacheWrap() makes the most appropriate cache-wrap.  For example,
-	IAVLStore.CacheWrap() returns a CacheKVStore.
-
-	CacheWrap() should not return a Committer, since Commit() on
-	cache-wraps make no sense.  It can return KVStore, HeapStore,
-	SpaceStore, etc.
-*/
+// CacheWrap makes the most appropriate cache-wrap. For example,
+// IAVLStore.CacheWrap() returns a CacheKVStore. CacheWrap should not return
+// a Committer, since Commit cache-wraps make no sense. It can return KVStore,
+// HeapStore, SpaceStore, etc.
 type CacheWrap interface {
-
 	// Write syncs with the underlying store.
 	Write()
 
 	// CacheWrap recursively wraps again.
 	CacheWrap() CacheWrap
+
+	// CacheWrapWithTrace recursively wraps again with tracing enabled.
+	CacheWrapWithTrace(w io.Writer, tc TraceContext) CacheWrap
 }
 
 type CacheWrapper interface { //nolint
+	// CacheWrap cache wraps.
 	CacheWrap() CacheWrap
+
+	// CacheWrapWithTrace cache wraps with tracing enabled.
+	CacheWrapWithTrace(w io.Writer, tc TraceContext) CacheWrap
 }
 
 //----------------------------------------
@@ -298,3 +331,7 @@ func (getter PrefixStoreGetter) KVStore(ctx Context) KVStore {
 type KVPair cmn.KVPair
 
 //----------------------------------------
+
+// TraceContext contains TraceKVStore context data. It will be written with
+// every trace operation.
+type TraceContext map[string]interface{}