Fix proto build

integration_tests/chain.go

@@ -194,7 +194,7 @@ func (c *chain) clientContext(nodeURI string, kb *keyring.Keyring, fromName stri
 	interfaceRegistry := sdkTypes.NewInterfaceRegistry()
 	interfaceRegistry.RegisterImplementations((*sdk.Msg)(nil),
 		&stakingtypes.MsgCreateValidator{},
-		&gravitytypes.MsgDelegateKeys{}, 
+		&gravitytypes.MsgDelegateKeys{},
 	)
 	interfaceRegistry.RegisterImplementations((*cryptotypes.PubKey)(nil), &secp256k1.PubKey{}, &ed25519.PubKey{})
 

integration_tests/genesis.go

@@ -5,13 +5,13 @@ import (
 	"fmt"
 	"os"
 
+	tmtypes "github.com/cometbft/cometbft/types"
 	"github.com/cosmos/cosmos-sdk/server"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	"github.com/cosmos/cosmos-sdk/x/genutil"
 	genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
-	tmtypes "github.com/cometbft/cometbft/types"
 )
 
 func getGenDoc(path string) (*tmtypes.GenesisDoc, error) {

integration_tests/validator.go

@@ -10,6 +10,10 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/client"
 
+	tmcfg "github.com/cometbft/cometbft/config"
+	tmos "github.com/cometbft/cometbft/libs/os"
+	"github.com/cometbft/cometbft/p2p"
+	"github.com/cometbft/cometbft/privval"
 	sdkcrypto "github.com/cosmos/cosmos-sdk/crypto"
 	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
 	"github.com/cosmos/cosmos-sdk/crypto/hd"
@@ -26,10 +30,6 @@ import (
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/peggyjv/gravity-bridge/module/v4/app"
 	gravitytypes "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types"
-	tmcfg "github.com/cometbft/cometbft/config"
-	tmos "github.com/cometbft/cometbft/libs/os"
-	"github.com/cometbft/cometbft/p2p"
-	"github.com/cometbft/cometbft/privval"
 )
 
 type validator struct {

module/Makefile

@@ -80,6 +80,10 @@ lint:
 ###                           Protobuf                                    ###
 ###############################################################################
 
+protoVer=0.13.1
+protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer)
+protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName)
+
 proto-all: proto-format proto-lint proto-gen
 
 proto-format:
@@ -93,7 +97,7 @@ proto-gen:
 	@echo "Generating Protobuf files"
 	# todo: figure out why this old method was failing
 	# $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace tendermintdev/sdk-proto-gen:v0.1 sh ./contrib/local/protocgen.sh
-	@sh ./contrib/local/protocgen.sh
+	@$(protoImage) sh ./contrib/local/protocgen.sh
 
 proto-lint:
 	@$(DOCKER_BUF) lint --error-format=json

module/app/app.go

@@ -580,8 +580,8 @@ func NewGravityApp(
 
 	app.setupUpgradeHandlers()
 
-	app.sm = module.NewSimulationManager(     
-		auth.NewAppModule(appCodec, app.accountKeeper, authsims.RandomGenesisAccounts, app.GetSubspace(authtypes.ModuleName)),	
+	app.sm = module.NewSimulationManager(
+		auth.NewAppModule(appCodec, app.accountKeeper, authsims.RandomGenesisAccounts, app.GetSubspace(authtypes.ModuleName)),
 		bank.NewAppModule(
 			appCodec,
 			app.bankKeeper,
@@ -592,7 +592,7 @@ func NewGravityApp(
 			appCodec,
 			*app.capabilityKeeper,
 			false,
-		),	
+		),
 		gov.NewAppModule(
 			appCodec,
 			&app.govKeeper,
@@ -632,7 +632,7 @@ func NewGravityApp(
 		evidence.NewAppModule(app.evidenceKeeper),
 		ibc.NewAppModule(app.ibcKeeper),
 		params.NewAppModule(app.paramsKeeper),
-		transferModule,	
+		transferModule,
 	)
 
 	app.sm.RegisterStoreDecoders()
@@ -730,7 +730,7 @@ func (app *Gravity) ModuleAccountAddressesToNames(moduleAccounts []string) map[s
 }
 
 func (app *Gravity) ModuleNames() []string {
-    return app.mm.ModuleNames()
+	return app.mm.ModuleNames()
 }
 
 // BlockedAddrs returns all the app's module account addresses that are not

module/app/sim_test.go

@@ -125,7 +125,7 @@ func TestAppImportExport(t *testing.T) {
 
 	fmt.Printf("exporting genesis...\n")
 
-    // Exports all modules
+	// Exports all modules
 	appState, err := app.ExportAppStateAndValidators(false, []string{}, app.mm.ModuleNames())
 	require.NoError(t, err)
 

module/buf.gen.yaml

@@ -0,0 +1,8 @@
+version: v1
+plugins:
+  - name: gocosmos
+    out: .
+    opt: plugins=interfacetype+grpc,Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types
+  - name: grpc-gateway
+    out: .
+    opt: logtostderr=true,allow_colon_final_segments=true

module/buf.work.yaml

@@ -0,0 +1,3 @@
+version: v1
+directories:
+  - proto

module/cmd/gravity/cmd/root.go

@@ -228,7 +228,7 @@ func (a appCreator) appExport(
 	forZeroHeight bool,
 	jailAllowedAddrs []string,
 	appOpts servertypes.AppOptions,
-    modulesToExport []string,
+	modulesToExport []string,
 ) (servertypes.ExportedApp, error) {
 
 	var gravity *app.Gravity

module/cmd/gravity/cmd/testnet.go

@@ -41,7 +41,7 @@ var (
 	flagOutputDir         = "output-dir"
 	flagNodeDaemonHome    = "node-daemon-home"
 	flagStartingIPAddress = "starting-ip-address"
-    flagKeyAlgorithm     = "key-algorithm"
+	flagKeyAlgorithm      = "key-algorithm"
 )
 
 // get cmd to initialize all files for tendermint testnet and application

module/contrib/local/protocgen.sh

@@ -2,12 +2,11 @@
 
 set -eo pipefail
 
-ROOT=$(git rev-parse --show-toplevel 2>/dev/null)
-
-cd $ROOT/module/proto
 echo "generating proto and gRPC gateway files..."
-buf generate --template buf.gen.gogo.yaml
+cd proto
+buf mod update
 cd ..
+buf generate
 
 # move proto files to the right places
 xpath=$(head -n 1 go.mod | sed 's/^module //')

module/go.mod

@@ -14,7 +14,6 @@ require (
 	github.com/cosmos/gogoproto v1.4.11
 	github.com/cosmos/ibc-go/v7 v7.3.2
 	github.com/ethereum/go-ethereum v1.10.22
-	github.com/gogo/protobuf v1.3.2
 	github.com/gorilla/mux v1.8.0
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
 	github.com/pkg/errors v0.9.1
@@ -90,6 +89,7 @@ require (
 	github.com/go-stack/stack v1.8.0 // indirect
 	github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
 	github.com/gogo/googleapis v1.4.1 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/glog v1.1.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/mock v1.6.0 // indirect

module/x/gravity/migrations/v1/types/interfaces.go

@@ -2,8 +2,8 @@ package types
 
 import (
 	tmbytes "github.com/cometbft/cometbft/libs/bytes"
-	"github.com/ethereum/go-ethereum/common"
 	"github.com/cosmos/gogoproto/proto"
+	"github.com/ethereum/go-ethereum/common"
 )
 
 // EthereumTxConfirmation represents one validtors signature for a given

module/x/gravity/types/interfaces.go

@@ -2,8 +2,8 @@ package types
 
 import (
 	tmbytes "github.com/cometbft/cometbft/libs/bytes"
-	"github.com/ethereum/go-ethereum/common"
 	"github.com/cosmos/gogoproto/proto"
+	"github.com/ethereum/go-ethereum/common"
 )
 
 // EthereumTxConfirmation represents one validtors signature for a given