Change list of Silei/v0.33.2

abci/types/types.proto

@@ -80,6 +80,7 @@ message RequestBeginBlock {
   Header            header               = 2 [(gogoproto.nullable) = false];
   LastCommitInfo    last_commit_info     = 3 [(gogoproto.nullable) = false];
   repeated Evidence byzantine_validators = 4 [(gogoproto.nullable) = false];
+  repeated bytes txs = 5;
 }
 
 enum CheckTxType {
@@ -186,10 +187,20 @@ message ResponseCheckTx {
   string codespace = 8;
 }
 
+message VMEvent {
+    bytes   address         = 1;
+    bytes   data            = 2;
+    repeated bytes topics   = 3;
+    uint64  block_number    = 4;
+    bytes   tx_hash         = 5;
+    bytes   block_hash      = 6;
+}
+
 message ResponseDeliverTx {
   uint32         code       = 1;
   bytes          data       = 2;
   string         log        = 3;  // nondeterministic
+  repeated VMEvent vmevents = 9;
   string         info       = 4;  // nondeterministic
   int64          gas_wanted = 5;
   int64          gas_used   = 6;

abci/types/util.go

@@ -3,6 +3,11 @@ package types
 import (
 	"bytes"
 	"sort"
+	"github.com/tendermint/tendermint/libs/kv"
+)
+
+const (
+	DefaultEvent = "origin-tags"
 )
 
 //------------------------------------------------------------------------------
@@ -32,3 +37,50 @@ func (v ValidatorUpdates) Swap(i, j int) {
 	v[i] = v[j]
 	v[j] = v1
 }
+
+func GetTagByKey(events []Event, key string) (kv.Pair, bool) {
+	for _, event := range events {
+		if event.GetType() != DefaultEvent {
+			continue
+		}
+		for _, tag := range event.Attributes {
+			if bytes.Equal(tag.Key, []byte(key)) {
+				return tag, true
+			}
+		}
+	}
+
+	return kv.Pair{}, false
+}
+
+func TagsToDefaultEvent(events []Event, tags ...kv.Pair) []Event {
+	if len(events) == 0 {
+		events = append(events, Event{Type: DefaultEvent})
+	}
+	for i, v := range events {
+		if v.Type == DefaultEvent {
+			events[i].Attributes = append(events[i].Attributes, tags...)
+		}
+	}
+	return events
+}
+
+func GetDefaultTags(events []Event) []kv.Pair {
+	for _, v := range events {
+		if v.Type == DefaultEvent {
+			pairs := make([]kv.Pair, len(v.Attributes))
+			copy(pairs, v.Attributes)
+			return pairs
+		}
+	}
+	return nil
+}
+
+func GetAllTags(events []Event) (pairs []kv.Pair) {
+	for _, v := range events {
+		ps := make([]kv.Pair, len(v.Attributes))
+		copy(ps, v.Attributes)
+		pairs = append(pairs, ps...)
+	}
+	return pairs
+}

blockchain/v0/reactor.go

@@ -333,7 +333,7 @@ FOR_LOOP:
 				bcR.pool.PopRequest()
 
 				// TODO: batch saves so we dont persist to disk every block
-				bcR.store.SaveBlock(first, firstParts, second.LastCommit)
+				bcR.store.SaveBlock(first, firstParts, second.LastCommit, true)
 
 				// TODO: same thing for app - but we would need a way to
 				// get the hash without persisting the state

blockchain/v1/reactor.go

@@ -427,7 +427,7 @@ func (bcR *BlockchainReactor) processBlock() error {
 		return errBlockVerificationFailure
 	}
 
-	bcR.store.SaveBlock(first, firstParts, second.LastCommit)
+	bcR.store.SaveBlock(first, firstParts, second.LastCommit, true)
 
 	bcR.state, err = bcR.blockExec.ApplyBlock(bcR.state, firstID, first)
 	if err != nil {

cmd/tendermint/commands/run_node.go

@@ -39,6 +39,9 @@ func AddNodeFlags(cmd *cobra.Command) {
 		[]byte{},
 		"Optional SHA-256 hash of the genesis file")
 
+	cmd.Flags().Bool("deprecated", config.Deprecated, "Mark blockchain as deprecated")
+	cmd.Flags().Int64("replay_height", config.ReplayHeight, "Specify which height to replay to, this is useful for exporting at any height")
+
 	// abci flags
 	cmd.Flags().String(
 		"proxy_app",

config/config.go

@@ -160,6 +160,13 @@ type BaseConfig struct { //nolint: maligned
 	// and verifying their commits
 	FastSyncMode bool `mapstructure:"fast_sync"`
 
+	// If the blockchain is deprecated, run node with Deprecated will
+	// work in query only mode. Consensus engine and p2p gossip will be
+	// shutdown
+	Deprecated bool `mapstructure:"deprecated"`
+
+	ReplayHeight int64 `mapstructure:"replay_height"`
+
 	// Database backend: goleveldb | cleveldb | boltdb | rocksdb
 	// * goleveldb (github.com/syndtr/goleveldb - most popular implementation)
 	//   - pure go
@@ -211,7 +218,7 @@ type BaseConfig struct { //nolint: maligned
 
 	// If true, query the ABCI app on connecting to a new peer
 	// so the app can decide if we should keep the connection or not
-	FilterPeers bool `mapstructure:"filter_peers"` // false
+	// FilterPeers bool `mapstructure:"filter_peers"` // false
 }
 
 // DefaultBaseConfig returns a default base configuration for a Tendermint node
@@ -228,7 +235,9 @@ func DefaultBaseConfig() BaseConfig {
 		LogFormat:          LogFormatPlain,
 		ProfListenAddress:  "",
 		FastSyncMode:       true,
-		FilterPeers:        false,
+		//FilterPeers:        false,
+		Deprecated:         false,
+		ReplayHeight:       -1,
 		DBBackend:          "goleveldb",
 		DBPath:             "data",
 	}
@@ -660,14 +669,14 @@ type MempoolConfig struct {
 // DefaultMempoolConfig returns a default configuration for the Tendermint mempool
 func DefaultMempoolConfig() *MempoolConfig {
 	return &MempoolConfig{
-		Recheck:   true,
+		Recheck:   false,
 		Broadcast: true,
 		WalPath:   "",
 		// Each signature verification takes .5ms, Size reduced until we implement
 		// ABCI Recheck
-		Size:        5000,
+		Size:        20000,
 		MaxTxsBytes: 1024 * 1024 * 1024, // 1GB
-		CacheSize:   10000,
+		CacheSize:   20000,
 		MaxTxBytes:  1024 * 1024, // 1MB
 	}
 }
@@ -773,7 +782,7 @@ type ConsensusConfig struct {
 func DefaultConsensusConfig() *ConsensusConfig {
 	return &ConsensusConfig{
 		WalPath:                     filepath.Join(defaultDataDir, "cs.wal", "wal"),
-		TimeoutPropose:              3000 * time.Millisecond,
+		TimeoutPropose:              1000 * time.Millisecond,
 		TimeoutProposeDelta:         500 * time.Millisecond,
 		TimeoutPrevote:              1000 * time.Millisecond,
 		TimeoutPrevoteDelta:         500 * time.Millisecond,

config/toml.go

@@ -86,6 +86,11 @@ moniker = "{{ .BaseConfig.Moniker }}"
 # and verifying their commits
 fast_sync = {{ .BaseConfig.FastSyncMode }}
 
+# If the blockchain is deprecated, run node with Deprecated will
+# work in query only mode. Consensus engine and p2p gossip will be
+# shutdown
+deprecated = {{ .BaseConfig.Deprecated }}
+
 # Database backend: goleveldb | cleveldb | boltdb | rocksdb
 # * goleveldb (github.com/syndtr/goleveldb - most popular implementation)
 #   - pure go
@@ -137,10 +142,6 @@ abci = "{{ .BaseConfig.ABCI }}"
 # TCP or UNIX socket address for the profiling server to listen on
 prof_laddr = "{{ .BaseConfig.ProfListenAddress }}"
 
-# If true, query the ABCI app on connecting to a new peer
-# so the app can decide if we should keep the connection or not
-filter_peers = {{ .BaseConfig.FilterPeers }}
-
 ##### advanced configuration options #####
 
 ##### rpc server configuration options #####