Main patch from tm-v0.34.9

.github/workflows/lint.yaml

@@ -18,10 +18,10 @@ jobs:
             **/**.go
             go.mod
             go.sum
-      - uses: golangci/golangci-lint-action@v2.2.1
+      - uses: golangci/golangci-lint-action@v2.5.1
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.31
-          args: --timeout 10m --skip-files "_test\.go" # for skip unused linter (https://github.com/golangci/golangci-lint/issues/791)
+          version: v1.38
+          args: --timeout 10m
           github-token: ${{ secrets.github_token }}
         if: env.GIT_DIFF

abci/client/grpc_client_test.go

@@ -26,7 +26,7 @@ func TestGrpcClientCalls(t *testing.T) {
 	})
 	err0 = c.Start()
 	require.NoError(t, err0)
-	
+
 	c.EchoAsync("msg", getResponseCallback(t))
 	c.FlushAsync(getResponseCallback(t))
 	c.InfoAsync(types.RequestInfo{}, getResponseCallback(t))

abci/client/local_client_test.go

@@ -14,7 +14,7 @@ type sampleApp struct {
 
 func newDoneChan(t *testing.T) chan struct{} {
 	result := make(chan struct{})
-	go func(){
+	go func() {
 		select {
 		case <-time.After(time.Second):
 			require.Fail(t, "callback is not called for a second")
@@ -27,9 +27,9 @@ func newDoneChan(t *testing.T) chan struct{} {
 
 func getResponseCallback(t *testing.T) ResponseCallback {
 	doneChan := newDoneChan(t)
-	return func (res *types.Response) {
+	return func(res *types.Response) {
 		require.NotNil(t, res)
-		doneChan<- struct{}{}
+		doneChan <- struct{}{}
 	}
 }
 

abci/client/socket_client_test.go

@@ -213,7 +213,7 @@ type sampleApp struct {
 
 func newDoneChan(t *testing.T) chan struct{} {
 	result := make(chan struct{})
-	go func(){
+	go func() {
 		select {
 		case <-time.After(time.Second):
 			require.Fail(t, "callback is not called for a second")
@@ -226,8 +226,8 @@ func newDoneChan(t *testing.T) chan struct{} {
 
 func getResponseCallback(t *testing.T) abcicli.ResponseCallback {
 	doneChan := newDoneChan(t)
-	return func (res *types.Response) {
+	return func(res *types.Response) {
 		require.NotNil(t, res)
-		doneChan<- struct{}{}
+		doneChan <- struct{}{}
 	}
 }

abci/types/application.go

@@ -4,6 +4,8 @@ import (
 	context "golang.org/x/net/context"
 )
 
+//go:generate mockery --case underscore --name Application
+
 type CheckTxCallback func(ResponseCheckTx)
 
 // Application is an interface that enables any finite, deterministic state machine

blockchain/v2/reactor_test.go

@@ -60,19 +60,22 @@ func (mp mockPeer) Get(string) interface{}  { return struct{}{} }
 
 func (mp mockPeer) String() string { return fmt.Sprintf("%v", mp.id) }
 
-//nolint:unused
+// nolint:unused // ignore
 type mockBlockStore struct {
 	blocks map[int64]*types.Block
 }
 
+// nolint:unused // ignore
 func (ml *mockBlockStore) Height() int64 {
 	return int64(len(ml.blocks))
 }
 
+// nolint:unused // ignore
 func (ml *mockBlockStore) LoadBlock(height int64) *types.Block {
 	return ml.blocks[height]
 }
 
+// nolint:unused // ignore
 func (ml *mockBlockStore) SaveBlock(block *types.Block, part *types.PartSet, commit *types.Commit) {
 	ml.blocks[block.Height] = block
 }

cmd/ostracon/commands/light.go

@@ -8,24 +8,23 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
-	"regexp"
 	"strings"
 	"time"
 
+	rpchttp "github.com/line/ostracon/rpc/client/http"
+
 	"github.com/line/tm-db/v2/goleveldb"
 	"github.com/spf13/cobra"
 
 	dbm "github.com/line/tm-db/v2"
 
-	"github.com/line/ostracon/crypto/merkle"
 	"github.com/line/ostracon/libs/log"
 	tmmath "github.com/line/ostracon/libs/math"
 	tmos "github.com/line/ostracon/libs/os"
 	"github.com/line/ostracon/light"
 	lproxy "github.com/line/ostracon/light/proxy"
 	lrpc "github.com/line/ostracon/light/rpc"
 	dbs "github.com/line/ostracon/light/store/db"
-	rpchttp "github.com/line/ostracon/rpc/client/http"
 	rpcserver "github.com/line/ostracon/rpc/jsonrpc/server"
 )
 
@@ -233,12 +232,11 @@ func runProxy(cmd *cobra.Command, args []string) error {
 		cfg.WriteTimeout = config.RPC.TimeoutBroadcastTxCommit + 1*time.Second
 	}
 
-	p := lproxy.Proxy{
-		Addr:   listenAddr,
-		Config: cfg,
-		Client: lrpc.NewClient(rpcClient, c, lrpc.KeyPathFn(defaultMerkleKeyPathFn())),
-		Logger: logger,
+	p, err := lproxy.NewProxy(c, listenAddr, primaryAddr, cfg, logger, lrpc.KeyPathFn(lrpc.DefaultMerkleKeyPathFn()))
+	if err != nil {
+		return err
 	}
+
 	// Stop upon receiving SIGTERM or CTRL-C.
 	tmos.TrapSignal(logger, func() {
 		p.Listener.Close()
@@ -277,21 +275,3 @@ func saveProviders(db dbm.DB, primaryAddr, witnessesAddrs string) error {
 	}
 	return nil
 }
-
-func defaultMerkleKeyPathFn() lrpc.KeyPathFunc {
-	// regexp for extracting store name from /abci_query path
-	storeNameRegexp := regexp.MustCompile(`\/store\/(.+)\/key`)
-
-	return func(path string, key []byte) (merkle.KeyPath, error) {
-		matches := storeNameRegexp.FindStringSubmatch(path)
-		if len(matches) != 2 {
-			return nil, fmt.Errorf("can't find store name in %s using %s", path, storeNameRegexp)
-		}
-		storeName := matches[1]
-
-		kp := merkle.KeyPath{}
-		kp = kp.AppendKey([]byte(storeName), merkle.KeyEncodingURL)
-		kp = kp.AppendKey(key, merkle.KeyEncodingURL)
-		return kp, nil
-	}
-}