Introduce safe state to unit tests

go.sum

@@ -553,8 +553,6 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=

jsonrpc/http_json_handler.go

@@ -123,12 +123,11 @@ func makeJSONRPCHandler(funcMap map[string]*RPCFunc, logger log.Logger) http.Han
 				cache = false
 			}
 
-			logger.Info("calling func", "method", request.Method, "args", args)
 			returns := rpcFunc.f.Call(args)
 			result, err := unreflectResult(returns)
-			logger.Info("result of calling func for %s: err: %s", request.Method, err)
 
 			if err != nil {
+				logger.Debug("unexpected result", "method", request.Method, "err", err)
 				responses = append(responses, types.RPCInternalError(request.ID, err))
 				continue
 			}

safestate/safestate.go

@@ -0,0 +1,67 @@
+package safestate
+
+import (
+	"github.com/cometbft/cometbft/state"
+	"github.com/cometbft/cometbft/types"
+	"sync"
+)
+
+type SafeState struct {
+	state.State
+	mtx *sync.RWMutex
+}
+
+func New(state state.State) SafeState {
+	return SafeState{
+		State: state,
+		mtx:   &sync.RWMutex{},
+	}
+}
+
+func (ss *SafeState) StateCopy() state.State {
+	ss.mtx.RLock()
+	defer ss.mtx.RUnlock()
+	return ss.State
+}
+
+func (ss *SafeState) StateBytes() []byte {
+	ss.mtx.RLock()
+	defer ss.mtx.RUnlock()
+	return ss.State.Bytes()
+}
+
+func (ss *SafeState) UpdateState(cmtState state.State) {
+	ss.mtx.Lock()
+	defer ss.mtx.Unlock()
+	ss.State = cmtState
+}
+
+func (ss *SafeState) LastBlockHeight() int64 {
+	ss.mtx.RLock()
+	defer ss.mtx.RUnlock()
+	return ss.State.LastBlockHeight
+}
+
+func (ss *SafeState) LastBlockID() types.BlockID {
+	ss.mtx.RLock()
+	defer ss.mtx.RUnlock()
+	return ss.State.LastBlockID
+}
+
+func (ss *SafeState) Validators() *types.ValidatorSet {
+	ss.mtx.RLock()
+	defer ss.mtx.RUnlock()
+	return ss.State.Validators
+}
+
+func (ss *SafeState) AppHash() []byte {
+	ss.mtx.RLock()
+	defer ss.mtx.RUnlock()
+	return ss.State.AppHash
+}
+
+func (ss *SafeState) ChainID() string {
+	ss.mtx.RLock()
+	defer ss.mtx.RUnlock()
+	return ss.State.ChainID
+}

vm/rpc.go

@@ -52,9 +52,9 @@ func (rpc *RPC) Routes() map[string]*jsonrpc.RPCFunc {
 		"commit":          jsonrpc.NewRPCFunc(rpc.Commit, "height", jsonrpc.Cacheable("height")),
 		// "header":              jsonrpc.NewRPCFunc(rpc.Header, "height", jsonrpc.Cacheable("height")),
 		// "header_by_hash":      jsonrpc.NewRPCFunc(rpc.HeaderByHash, "hash", jsonrpc.Cacheable()),
-		"check_tx": jsonrpc.NewRPCFunc(rpc.CheckTx, "tx"),
-		"tx":       jsonrpc.NewRPCFunc(rpc.Tx, "hash,prove", jsonrpc.Cacheable()),
-		// "consensus_state":     jsonrpc.NewRPCFunc(rpc.GetConsensusState, ""),
+		"check_tx":             jsonrpc.NewRPCFunc(rpc.CheckTx, "tx"),
+		"tx":                   jsonrpc.NewRPCFunc(rpc.Tx, "hash,prove", jsonrpc.Cacheable()),
+		"consensus_state":      jsonrpc.NewRPCFunc(rpc.GetConsensusState, ""),
 		"unconfirmed_txs":      jsonrpc.NewRPCFunc(rpc.UnconfirmedTxs, "limit"),
 		"num_unconfirmed_txs":  jsonrpc.NewRPCFunc(rpc.NumUnconfirmedTxs, ""),
 		"tx_search":            jsonrpc.NewRPCFunc(rpc.TxSearch, "query,prove,page,per_page,order_by"),