Merge pull request #569 from PeggyJV/collin/v5-upgrade

v5 Upgrade

integration_tests/chain.go

@@ -39,10 +39,10 @@ import (
 	upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client"
 	ibctransfer "github.com/cosmos/ibc-go/v7/modules/apps/transfer"
 	ibc "github.com/cosmos/ibc-go/v7/modules/core"
-	"github.com/peggyjv/gravity-bridge/module/v4/app"
-	"github.com/peggyjv/gravity-bridge/module/v4/app/params"
-	gravityclient "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/client"
-	gravitytypes "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types"
+	"github.com/peggyjv/gravity-bridge/module/v5/app"
+	"github.com/peggyjv/gravity-bridge/module/v5/app/params"
+	gravityclient "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/client"
+	gravitytypes "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types"
 )
 
 const (

integration_tests/ethereum.go

@@ -10,7 +10,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common"
-	gravitytypes "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types"
+	gravitytypes "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types"
 )
 
 type EthereumConfig struct {

integration_tests/happy_path_test.go

@@ -15,7 +15,7 @@ import (
 	govtypesv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ory/dockertest/v3"
-	"github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types"
+	"github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types"
 )
 
 func (s *IntegrationTestSuite) TestHappyPath() {

integration_tests/setup_test.go

@@ -38,7 +38,7 @@ import (
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 	"github.com/ory/dockertest/v3"
 	"github.com/ory/dockertest/v3/docker"
-	gravitytypes "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types"
+	gravitytypes "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/suite"
 )

integration_tests/transaction_stress_test.go

@@ -10,7 +10,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types"
+	"github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types"
 )
 
 // We have 4 validators running so this totals to 100 tx's

integration_tests/validator.go

@@ -28,8 +28,8 @@ import (
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"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"
+	"github.com/peggyjv/gravity-bridge/module/v5/app"
+	gravitytypes "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types"
 )
 
 type validator struct {

integration_tests/validator_out.go

@@ -8,7 +8,7 @@ import (
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types"
+	"github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types"
 )
 
 // Validator out tests a validator that is not running the mandatory Ethereum node. This validator will be slashed and the bridge will remain functioning.

integration_tests/valset_stress_test.go

@@ -7,7 +7,7 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/staking/types"
-	gravity "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types"
+	gravity "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types"
 )
 
 // call stress_test for a range of nonce values

module/Makefile

@@ -80,7 +80,7 @@ lint:
 ###                           Protobuf                                    ###
 ###############################################################################
 
-protoVer=0.13.1
+protoVer=0.15.1
 protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer)
 protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName)
 

module/app/app.go

@@ -94,11 +94,12 @@ import (
 	icaexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
 	ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
 	"github.com/gorilla/mux"
-	gravityparams "github.com/peggyjv/gravity-bridge/module/v4/app/params"
-	"github.com/peggyjv/gravity-bridge/module/v4/x/gravity"
-	gravityclient "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/client"
-	"github.com/peggyjv/gravity-bridge/module/v4/x/gravity/keeper"
-	gravitytypes "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types"
+	gravityparams "github.com/peggyjv/gravity-bridge/module/v5/app/params"
+	v5 "github.com/peggyjv/gravity-bridge/module/v5/app/upgrades/v5"
+	"github.com/peggyjv/gravity-bridge/module/v5/x/gravity"
+	gravityclient "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/client"
+	"github.com/peggyjv/gravity-bridge/module/v5/x/gravity/keeper"
+	gravitytypes "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types"
 	"github.com/rakyll/statik/fs"
 	"github.com/spf13/cast"
 
@@ -922,5 +923,11 @@ func (app *Gravity) setupUpgradeStoreLoaders() {
 }
 
 func (app *Gravity) setupUpgradeHandlers() {
-
+	app.upgradeKeeper.SetUpgradeHandler(
+		v5.UpgradeName,
+		v5.CreateUpgradeHandler(
+			app.mm,
+			app.configurator,
+		),
+	)
 }

module/app/encoding.go

@@ -2,7 +2,7 @@ package app
 
 import (
 	"github.com/cosmos/cosmos-sdk/std"
-	gravityparams "github.com/peggyjv/gravity-bridge/module/v4/app/params"
+	gravityparams "github.com/peggyjv/gravity-bridge/module/v5/app/params"
 )
 
 // MakeEncodingConfig creates an EncodingConfig for gravity.

module/app/upgrades/v2/upgrades.go

@@ -7,7 +7,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
-	gravitytypes "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types"
+	gravitytypes "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types"
 )
 
 func CreateUpgradeHandler(

module/app/upgrades/v2/upgrades_test.go

@@ -8,8 +8,8 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/peggyjv/gravity-bridge/module/v4/x/gravity/keeper"
-	"github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types"
+	"github.com/peggyjv/gravity-bridge/module/v5/x/gravity/keeper"
+	"github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types"
 	"github.com/stretchr/testify/require"
 )
 

module/app/upgrades/v5/README.md

@@ -0,0 +1,4 @@
+# v5 upgrade
+
+This upgrade simply fixes the bug in the `SubmitEthereumTxConfirmation` message handler where `CompletedOutgoingTx`s were not checked and therefore could not be signed by orchestrators that failed to sign before the transaction was completed, resulting in jailing and slashing. Because this is a state breaking change, we bump the consensus version of the module.
+

module/app/upgrades/v5/constants.go

@@ -0,0 +1,4 @@
+package v5
+
+// UpgradeName defines the on-chain upgrade name for the Gravity v5 upgrade
+const UpgradeName = "v5"

module/app/upgrades/v5/upgrades.go

@@ -0,0 +1,18 @@
+package v5
+
+import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+)
+
+func CreateUpgradeHandler(
+	mm *module.Manager,
+	configurator module.Configurator,
+) upgradetypes.UpgradeHandler {
+	return func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
+		ctx.Logger().Info("v5 upgrade: entering handler")
+
+		return mm.RunMigrations(ctx, configurator, fromVM)
+	}
+}

module/cmd/gravity/cmd/gentx.go

@@ -37,7 +37,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/genutil/types"
 	"github.com/cosmos/cosmos-sdk/x/staking/client/cli"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
-	gravitytypes "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types"
+	gravitytypes "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types"
 )
 
 // GenTxCmd builds the application's gentx command.

module/cmd/gravity/cmd/root.go

@@ -31,8 +31,8 @@ import (
 	"github.com/spf13/cast"
 	"github.com/spf13/cobra"
 
-	"github.com/peggyjv/gravity-bridge/module/v4/app"
-	"github.com/peggyjv/gravity-bridge/module/v4/app/params"
+	"github.com/peggyjv/gravity-bridge/module/v5/app"
+	"github.com/peggyjv/gravity-bridge/module/v5/app/params"
 )
 
 // NewRootCmd creates a new root command for simd. It is called once in the

module/cmd/gravity/cmd/root_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/keys"
 	"github.com/cosmos/cosmos-sdk/crypto/hd"
 	"github.com/cosmos/cosmos-sdk/crypto/keyring"
-	"github.com/peggyjv/gravity-bridge/module/v4/app"
+	"github.com/peggyjv/gravity-bridge/module/v5/app"
 	"github.com/spf13/cobra"
 	"github.com/stretchr/testify/require"
 )

module/cmd/gravity/main.go

@@ -4,7 +4,7 @@ import (
 	"os"
 
 	"github.com/cosmos/cosmos-sdk/server"
-	"github.com/peggyjv/gravity-bridge/module/v4/cmd/gravity/cmd"
+	"github.com/peggyjv/gravity-bridge/module/v5/cmd/gravity/cmd"
 )
 
 func main() {

module/go.mod

@@ -1,4 +1,4 @@
-module github.com/peggyjv/gravity-bridge/module/v4
+module github.com/peggyjv/gravity-bridge/module/v5
 
 go 1.22
 

module/proto/buf.lock

@@ -19,5 +19,5 @@ deps:
   - remote: buf.build
     owner: googleapis
     repository: googleapis
-    commit: 4ed3bc159a8b4ac68fe253218760d035
-    digest: shake256:7149cf5e9955c692d381e557830555d4e93f205a0f1b8e2dfdae46d029369aa3fc1980e35df0d310f7cc3b622f93e19ad276769a283a967dd3065ddfd3a40e13
+    commit: e7f8d366f5264595bcc4cd4139af9973
+    digest: shake256:e5e5f1c12f82e028ea696faa43b4f9dc6258a6d1226282962a8c8b282e10946281d815884f574bd279ebd9cd7588629beb3db17b892af6c33b56f92f8f67f509

module/proto/gravity/v1/genesis.proto

@@ -6,7 +6,7 @@ import "gravity/v1/gravity.proto";
 import "gravity/v1/msgs.proto";
 import "google/protobuf/any.proto";
 
-option go_package = "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types";
+option go_package = "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types";
 option (gogoproto.messagename_all) = true;
 
 // Params represent the Gravity genesis and store parameters

module/proto/gravity/v1/gravity.proto

@@ -6,7 +6,7 @@ import "cosmos_proto/cosmos.proto";
 import "gogoproto/gogo.proto";
 import "google/protobuf/any.proto";
 
-option go_package = "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types";
+option go_package = "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types";
 option (gogoproto.messagename_all) = true;
 
 // EthereumEventVoteRecord is an event that is pending of confirmation by 2/3 of

module/proto/gravity/v1/msgs.proto

@@ -10,13 +10,13 @@ import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 import "google/protobuf/any.proto";
 
-option go_package = "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types";
+option go_package = "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types";
 option (gogoproto.messagename_all) = true;
 
 // Msg defines the state transitions possible within gravity
 service Msg {
   option (cosmos.msg.v1.service) = true;
-  
+
   rpc SendToEthereum(MsgSendToEthereum) returns (MsgSendToEthereumResponse) {
     // option (google.api.http).post = "/gravity/v1/send_to_ethereum";
   }
@@ -129,7 +129,7 @@ message MsgSubmitEthereumEventResponse {}
 // to a given orchestrator address. This key is then used as an optional
 // authentication method for attesting events from Ethereum.
 message MsgDelegateKeys {
-  option (cosmos.msg.v1.signer) = "validator_address";  
+  option (cosmos.msg.v1.signer) = "validator_address";
   option (amino.name)           = "gravity/MsgDelegateKeys";
 
   string validator_address = 1;

module/proto/gravity/v1/query.proto

@@ -11,7 +11,7 @@ import "gravity/v1/genesis.proto";
 import "gravity/v1/gravity.proto";
 import "gravity/v1/msgs.proto";
 
-option go_package = "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types";
+option go_package = "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types";
 option (gogoproto.messagename_all) = true;
 
 // Query defines the gRPC querier service
@@ -30,7 +30,7 @@ service Query {
     option (google.api.http).get = "/gravity/v1/signer_set_txs/latest";
   }
   rpc BatchTx(BatchTxRequest) returns (BatchTxResponse) {
-    option (google.api.http).get = "/gravity/v1/batch_txs/{token_contract}/{batch_nonce}"; 
+    option (google.api.http).get = "/gravity/v1/batch_txs/{token_contract}/{batch_nonce}";
   }
   rpc ContractCallTx(ContractCallTxRequest) returns (ContractCallTxResponse) {
     option (google.api.http).get = "/gravity/v1/contract_call_txs/{invalidation_scope}/{invalidation_nonce}";

module/x/gravity/abci.go

@@ -5,8 +5,8 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/peggyjv/gravity-bridge/module/v4/x/gravity/keeper"
-	"github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types"
+	"github.com/peggyjv/gravity-bridge/module/v5/x/gravity/keeper"
+	"github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types"
 )
 
 // BeginBlocker is called at the beginning of every block

module/x/gravity/abci_test.go

@@ -12,9 +12,9 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/stretchr/testify/require"
 
-	"github.com/peggyjv/gravity-bridge/module/v4/x/gravity"
-	"github.com/peggyjv/gravity-bridge/module/v4/x/gravity/keeper"
-	"github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types"
+	"github.com/peggyjv/gravity-bridge/module/v5/x/gravity"
+	"github.com/peggyjv/gravity-bridge/module/v5/x/gravity/keeper"
+	"github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types"
 )
 
 func TestSignerSetTxCreationIfNotAvailable(t *testing.T) {

module/x/gravity/client/cli/query.go

@@ -8,7 +8,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types"
+	"github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types"
 	"github.com/spf13/cobra"
 )
 

module/x/gravity/client/cli/tx.go

@@ -15,7 +15,7 @@ import (
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/spf13/cobra"
 
-	"github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types"
+	"github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types"
 )
 
 func GetTxCmd(storeKey string) *cobra.Command {

module/x/gravity/client/cli/utils.go

@@ -4,7 +4,7 @@ import (
 	"io/ioutil"
 
 	"github.com/cosmos/cosmos-sdk/codec"
-	"github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types"
+	"github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types"
 )
 
 // ParseCommunityPoolEthereumSpendProposal reads and parses a CommunityPoolEthereumSpendProposalForCLI from a file.

module/x/gravity/client/proposal_handler.go

@@ -2,7 +2,7 @@ package client
 
 import (
 	govclient "github.com/cosmos/cosmos-sdk/x/gov/client"
-	"github.com/peggyjv/gravity-bridge/module/v4/x/gravity/client/cli"
+	"github.com/peggyjv/gravity-bridge/module/v5/x/gravity/client/cli"
 )
 
 // ProposalHandler is the community Ethereum spend proposal handler.

module/x/gravity/cosmos_originated_test.go

@@ -10,10 +10,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/peggyjv/gravity-bridge/module/v4/app"
-	"github.com/peggyjv/gravity-bridge/module/v4/x/gravity"
-	"github.com/peggyjv/gravity-bridge/module/v4/x/gravity/keeper"
-	"github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types"
+	"github.com/peggyjv/gravity-bridge/module/v5/app"
+	"github.com/peggyjv/gravity-bridge/module/v5/x/gravity"
+	"github.com/peggyjv/gravity-bridge/module/v5/x/gravity/keeper"
+	"github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types"
 )
 
 // Have the validators put in a erc20<>denom relation with ERC20DeployedEvent

module/x/gravity/handler.go

@@ -6,8 +6,8 @@ import (
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
 
-	"github.com/peggyjv/gravity-bridge/module/v4/x/gravity/keeper"
-	"github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types"
+	"github.com/peggyjv/gravity-bridge/module/v5/x/gravity/keeper"
+	"github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types"
 )
 
 // NewHandler returns a handler for "Gravity" type messages.

module/x/gravity/handler_test.go

@@ -11,10 +11,10 @@ import (
 	"github.com/stretchr/testify/require"
 
 	ethCrypto "github.com/ethereum/go-ethereum/crypto"
-	"github.com/peggyjv/gravity-bridge/module/v4/app"
-	"github.com/peggyjv/gravity-bridge/module/v4/x/gravity"
-	"github.com/peggyjv/gravity-bridge/module/v4/x/gravity/keeper"
-	"github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types"
+	"github.com/peggyjv/gravity-bridge/module/v5/app"
+	"github.com/peggyjv/gravity-bridge/module/v5/x/gravity"
+	"github.com/peggyjv/gravity-bridge/module/v5/x/gravity/keeper"
+	"github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types"
 )
 
 func TestHandleMsgSendToEthereum(t *testing.T) {