update from single-step

docker-compose.yml

@@ -49,11 +49,14 @@ services:
     # apk add make upx
     # upx --best --lzma
     working_dir: /workspace
+    restart: on-failure
     tty: true
     volumes:
       - ./orchestrator:/orchestrator
       - ./e2e/.gbt/:/root/.gbt
     entrypoint: tail -f /dev/null
+    depends_on:
+      - gravity
 
   orai:
     container_name: orai_test

module/app/app.go

@@ -1,7 +1,6 @@
 package app
 
 import (
-	"fmt"
 	"io"
 	"net/http"
 	"os"
@@ -31,7 +30,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/server/config"
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
 	"github.com/cosmos/cosmos-sdk/simapp"
-	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	"github.com/cosmos/cosmos-sdk/version"
@@ -114,7 +112,6 @@ import (
 	"github.com/Gravity-Bridge/Gravity-Bridge/module/app/ante"
 	gravityparams "github.com/Gravity-Bridge/Gravity-Bridge/module/app/params"
 	"github.com/Gravity-Bridge/Gravity-Bridge/module/app/upgrades"
-	v2 "github.com/Gravity-Bridge/Gravity-Bridge/module/app/upgrades/v2"
 	"github.com/Gravity-Bridge/Gravity-Bridge/module/x/gravity"
 	"github.com/Gravity-Bridge/Gravity-Bridge/module/x/gravity/exported"
 	"github.com/Gravity-Bridge/Gravity-Bridge/module/x/gravity/keeper"
@@ -563,7 +560,7 @@ func NewGravityApp(
 
 	var skipGenesisInvariants = cast.ToBool(appOpts.Get(crisis.FlagSkipGenesisInvariants))
 
-	app.registerStoreLoaders()
+	// app.registerStoreLoaders()
 
 	mm := *module.NewManager(
 		genutil.NewAppModule(
@@ -974,29 +971,29 @@ func (app *Gravity) registerUpgradeHandlers() {
 	)
 }
 
-// Sets up the StoreLoader for new, deleted, or renamed modules
-func (app *Gravity) registerStoreLoaders() {
-	// Read the upgrade height and name from previous execution
-	upgradeInfo, err := app.upgradeKeeper.ReadUpgradeInfoFromDisk()
-	if err != nil {
-		panic(fmt.Sprintf("failed to read upgrade info from disk %s", err))
-	}
-
-	// v1->v2 STORE LOADER SETUP
-	// Register the new v2 modules and the special StoreLoader to add them
-	if upgradeInfo.Name == v2.V1ToV2PlanName {
-		if !app.upgradeKeeper.IsSkipHeight(upgradeInfo.Height) { // Recognized the plan, need to skip this one though
-			storeUpgrades := storetypes.StoreUpgrades{
-				Added: []string{bech32ibctypes.ModuleName}, // We are adding these modules
-				// Check upgrade docs to see which type of store loader is necessary for deletes/renames
-				// Renamed: []storetypes.StoreRename{{"foo", "bar"}}, example foo to bar rename
-				// Deleted: []string{"bazmodule"}, example deleted bazmodule
-				Renamed: nil,
-				Deleted: nil,
-			}
-
-			// configure store loader that checks if version == upgradeHeight and applies store upgrades
-			app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &storeUpgrades))
-		}
-	}
-}
+// // Sets up the StoreLoader for new, deleted, or renamed modules
+// func (app *Gravity) registerStoreLoaders() {
+// 	// Read the upgrade height and name from previous execution
+// 	upgradeInfo, err := app.upgradeKeeper.ReadUpgradeInfoFromDisk()
+// 	if err != nil {
+// 		panic(fmt.Sprintf("failed to read upgrade info from disk %s", err))
+// 	}
+
+// 	// v1->v2 STORE LOADER SETUP
+// 	// Register the new v2 modules and the special StoreLoader to add them
+// 	if upgradeInfo.Name == v2.V1ToV2PlanName {
+// 		if !app.upgradeKeeper.IsSkipHeight(upgradeInfo.Height) { // Recognized the plan, need to skip this one though
+// 			storeUpgrades := storetypes.StoreUpgrades{
+// 				Added: []string{bech32ibctypes.ModuleName}, // We are adding these modules
+// 				// Check upgrade docs to see which type of store loader is necessary for deletes/renames
+// 				// Renamed: []storetypes.StoreRename{{"foo", "bar"}}, example foo to bar rename
+// 				// Deleted: []string{"bazmodule"}, example deleted bazmodule
+// 				Renamed: nil,
+// 				Deleted: nil,
+// 			}
+
+// 			// configure store loader that checks if version == upgradeHeight and applies store upgrades
+// 			app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &storeUpgrades))
+// 		}
+// 	}
+// }

module/app/upgrades/register.go

@@ -13,7 +13,7 @@ import (
 	upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper"
 	ibctransferkeeper "github.com/cosmos/ibc-go/v3/modules/apps/transfer/keeper"
 
-	"github.com/Gravity-Bridge/Gravity-Bridge/module/app/upgrades/pleiades"
+	"github.com/Gravity-Bridge/Gravity-Bridge/module/app/upgrades/singlestep"
 )
 
 // RegisterUpgradeHandlers registers handlers for all upgrades
@@ -52,14 +52,23 @@ func RegisterUpgradeHandlers(
 	// 	pleiades.GetPleiadesUpgradeHandler(mm, configurator, crisisKeeper, gravityKeeper, bech32IbcKeeper),
 	// )
 
-	upgradeKeeper.SetUpgradeHandler(
-		pleiades.PleiadesPart1ToPart2PlanName,
-		pleiades.GetPleiades2UpgradeHandler(mm, configurator, crisisKeeper),
-	)
+	// upgradeKeeper.SetUpgradeHandler(
+	// 	pleiades.PleiadesPart1ToPart2PlanName,
+	// 	pleiades.GetPleiades2UpgradeHandler(mm, configurator, crisisKeeper),
+	// )
 
 	// // Pleiades part 2 aka v3->v4 UPGRADE HANDLER SETUP
 	// upgradeKeeper.SetUpgradeHandler(
 	// 	pleiades.PleiadesPart1ToPart2PlanName,
 	// 	pleiades.GetPleiades2UpgradeHandler(mm, configurator, crisisKeeper),
 	// )
+
+	// upgradeKeeper.SetUpgradeHandler(
+	// 	tron.PlanName,
+	// 	tron.GetTronUpgradeHandler(mm, configurator, crisisKeeper),
+	// )
+	upgradeKeeper.SetUpgradeHandler(
+		singlestep.PlanName,
+		singlestep.GetUpgradeHandler(mm, configurator, crisisKeeper),
+	)
 }

module/app/upgrades/singlestep/README.md

@@ -0,0 +1,8 @@
+# SingleStep UPGRADE
+
+The _Single Step_ upgrade contains the following changes.
+
+## Summary of Changes
+
+- Add a remove evm chain msg which allows anyone to create an on-chain proposal to remove an evm chain
+- Introduces a new CosmosReceiver string format to redirect OraiBridge tokens to appropriate source channels and destinations

module/app/upgrades/singlestep/constants.go

@@ -0,0 +1,3 @@
+package singlestep
+
+var PlanName = "singlestep"

module/app/upgrades/singlestep/handler.go

@@ -0,0 +1,28 @@
+package singlestep
+
+import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+	crisiskeeper "github.com/cosmos/cosmos-sdk/x/crisis/keeper"
+	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+)
+
+func GetUpgradeHandler(
+	mm *module.Manager, configurator *module.Configurator, crisisKeeper *crisiskeeper.Keeper,
+) func(
+	ctx sdk.Context, plan upgradetypes.Plan, vmap module.VersionMap,
+) (module.VersionMap, error) {
+	if mm == nil {
+		panic("Nil argument to GetSingleStepUpgradeHandler")
+	}
+	return func(ctx sdk.Context, plan upgradetypes.Plan, vmap module.VersionMap) (module.VersionMap, error) {
+
+		ctx.Logger().Info("SingleStep Upgrade: Running any configured module migrations")
+		out, outErr := mm.RunMigrations(ctx, *configurator, vmap)
+
+		ctx.Logger().Info("Asserting invariants after upgrade")
+		crisisKeeper.AssertInvariants(ctx)
+
+		return out, outErr
+	}
+}

module/app/upgrades/tron/README.md

@@ -0,0 +1,7 @@
+# TRON UPGRADE
+
+The *Tron* upgrade contains the following changes.
+
+## Summary of Changes
+
+* Disable filtering evm net version

module/app/upgrades/tron/constants.go

@@ -0,0 +1,3 @@
+package tron
+
+var PlanName = "tron"

module/app/upgrades/tron/handler.go

@@ -0,0 +1,28 @@
+package tron
+
+import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+	crisiskeeper "github.com/cosmos/cosmos-sdk/x/crisis/keeper"
+	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+)
+
+func GetTronUpgradeHandler(
+	mm *module.Manager, configurator *module.Configurator, crisisKeeper *crisiskeeper.Keeper,
+) func(
+	ctx sdk.Context, plan upgradetypes.Plan, vmap module.VersionMap,
+) (module.VersionMap, error) {
+	if mm == nil {
+		panic("Nil argument to GetTronUpgradeHandler")
+	}
+	return func(ctx sdk.Context, plan upgradetypes.Plan, vmap module.VersionMap) (module.VersionMap, error) {
+
+		ctx.Logger().Info("Tron Upgrade: Running any configured module migrations")
+		out, outErr := mm.RunMigrations(ctx, *configurator, vmap)
+
+		ctx.Logger().Info("Asserting invariants after upgrade")
+		crisisKeeper.AssertInvariants(ctx)
+
+		return out, outErr
+	}
+}

module/proto/gravity/v1/types.proto

@@ -117,11 +117,29 @@ message AddEvmChainProposal {
   string bridge_ethereum_address = 7;
 }
 
-// PendingIbcAutoForward represents a SendToCosmos transaction with a foreign CosmosReceiver which will be added to the
-// PendingIbcAutoForward queue in attestation_handler and sent over IBC on some submission of a MsgExecuteIbcAutoForwards
+// RemoveEvmChainProposal
+// this types allows users to remove an EVM chain through gov proposal
+message RemoveEvmChainProposal {
+  option (gogoproto.equal) = true;
+  option (gogoproto.goproto_getters) = false;
+  option (gogoproto.goproto_stringer) = false;
+
+  string title = 1;
+  string description = 2;
+  string evm_chain_prefix = 3;
+}
+
+// PendingIbcAutoForward represents a SendToCosmos transaction with a foreign
+// CosmosReceiver which will be added to the PendingIbcAutoForward queue in
+// attestation_handler and sent over IBC on some submission of a
+// MsgExecuteIbcAutoForwards
 message PendingIbcAutoForward {
-  string foreign_receiver = 1;         // the destination address. sdk.AccAddress does not preserve foreign prefixes
-  cosmos.base.v1beta1.Coin token = 2; // the token sent from ethereum to the ibc-enabled chain over `IbcChannel`
-  string ibc_channel = 3;              // the IBC channel to send `Amount` over via ibc-transfer module
-  uint64 event_nonce = 4;              // the EventNonce from the MsgSendToCosmosClaim, used for ordering the queue
+  string foreign_receiver = 1; // the destination address. sdk.AccAddress does
+                               // not preserve foreign prefixes
+  cosmos.base.v1beta1.Coin token = 2; // the token sent from ethereum to the
+                                      // ibc-enabled chain over `IbcChannel`
+  string ibc_channel =
+      3; // the IBC channel to send `Amount` over via ibc-transfer module
+  uint64 event_nonce = 4; // the EventNonce from the MsgSendToCosmosClaim, used
+                          // for ordering the queue
 }

module/x/gravity/abci_test.go

@@ -122,7 +122,6 @@ func TestValsetSlashing_ValsetCreated_After_ValidatorBonded(t *testing.T) {
 	// ensure that the  validator who is bonded before valset is created is slashed
 	// now validator will not be slashed, unless all evm chains are not updated
 	val := input.StakingKeeper.Validator(ctx, keeper.ValAddrs[0])
-	// require.True(t, val.IsJailed())
 	require.False(t, val.IsJailed())
 
 	// ensure that the  validator who attested the valset is not slashed.
@@ -445,19 +444,16 @@ func TestBatchSlashing(t *testing.T) {
 
 	// ensure that the  validator is jailed and slashed
 	val := input.StakingKeeper.Validator(ctx, keeper.ValAddrs[0])
-	// require.True(t, val.IsJailed())
 	require.False(t, val.IsJailed())
 
 	// ensure that the 2nd  validator is not jailed and slashed
 	val2 := input.StakingKeeper.Validator(ctx, keeper.ValAddrs[1])
 	require.False(t, val2.IsJailed())
 
 	// Ensure that the last slashed valset nonce is set properly
-	// lastSlashedBatchBlock := input.GravityKeeper.GetLastSlashedBatchBlock(ctx, evmChain.EvmChainPrefix)
-	// assert.Equal(t, lastSlashedBatchBlock, batch.CosmosBlockCreated)
-
-	// assert.True(t, len(pk.GetUnSlashedBatches(ctx, evmChain.EvmChainPrefix, uint64(ctx.BlockHeight()))) == 0)
-	assert.False(t, len(pk.GetUnSlashedBatches(ctx, evmChain.EvmChainPrefix, uint64(ctx.BlockHeight()))) == 0)
+	lastSlashedBatchBlock := input.GravityKeeper.GetLastSlashedBatchBlock(ctx, evmChain.EvmChainPrefix)
+	assert.NotEqual(t, lastSlashedBatchBlock, batch.CosmosBlockCreated)
+	assert.True(t, len(pk.GetUnSlashedBatches(ctx, evmChain.EvmChainPrefix, uint64(ctx.BlockHeight()))) != 0)
 
 }
 

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

@@ -47,6 +47,7 @@ func GetTxCmd(storeKey string) *cobra.Command {
 		CmdGovUnhaltBridgeProposal(),
 		CmdExecutePendingIbcAutoForwards(),
 		CmdAddEvmChainProposal(),
+		CmdRemoveEvmChainProposal(),
 	}...)
 
 	return gravityTxCmd
@@ -357,6 +358,53 @@ func CmdAddEvmChainProposal() *cobra.Command {
 	return cmd
 }
 
+// CmdRemoveEvmChainProposal enables users to create a proposal to add new EVM chains
+func CmdRemoveEvmChainProposal() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "remove-evm-chain [evm-chain-prefix] [initial-deposit] [title] [description]",
+		Short: "Creates a governance proposal to remove an EVM chain on the network",
+		Args:  cobra.ExactArgs(4),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			cliCtx, err := client.GetClientTxContext(cmd)
+			if err != nil {
+				return err
+			}
+			cosmosAddr := cliCtx.GetFromAddress()
+
+			initialDeposit, err := sdk.ParseCoinsNormalized(args[1])
+			if err != nil {
+				return sdkerrors.Wrap(err, "bad initial deposit amount")
+			}
+
+			if len(initialDeposit) != 1 {
+				return fmt.Errorf("unexpected coin amounts, expecting just 1 coin amount for initialDeposit")
+			}
+
+			evmChainPrefix := args[0]
+
+			proposal := &types.RemoveEvmChainProposal{EvmChainPrefix: evmChainPrefix, Title: args[2], Description: args[3]}
+			proposalAny, err := codectypes.NewAnyWithValue(proposal)
+			if err != nil {
+				return sdkerrors.Wrap(err, "invalid metadata or proposal details!")
+			}
+
+			// Make the message
+			msg := govtypes.MsgSubmitProposal{
+				Proposer:       cosmosAddr.String(),
+				InitialDeposit: initialDeposit,
+				Content:        proposalAny,
+			}
+			if err := msg.ValidateBasic(); err != nil {
+				return err
+			}
+			// Send it
+			return tx.GenerateOrBroadcastTxCLI(cliCtx, cmd.Flags(), &msg)
+		},
+	}
+	flags.AddTxFlagsToCmd(cmd)
+	return cmd
+}
+
 // CmdSendToEth sends tokens to Ethereum. Locks Cosmos-side tokens into the Transaction pool for batching.
 func CmdSendToEth() *cobra.Command {
 	// nolint: exhaustruct