Merge pull request #1 from oraichain/e2e-testings

E2e testings

docs/developer/e2e-tests.md

@@ -86,7 +86,7 @@ BLOCK_TO_SEARCH=100 cargo run -p gbt -- --home /root/.gbt/ --address-prefix orai
 In side the Gravity test network, run:
 
 ```bash
-gravity tx gravity send-to-eth 0xc9B6f87d637d4774EEB54f8aC2b89dBC3D38226b 9goerli-testnet0xf48007ea0F3AA4d2A59DFb4473dd30f90488c8Ef 1goerli-testnet0xf48007ea0F3AA4d2A59DFb4473dd30f90488c8Ef goerli-testnet --home data/validator1 -y --from validator1
+gravity tx gravity send-to-eth 0xc9B6f87d637d4774EEB54f8aC2b89dBC3D38226b 1foobar0xf48007ea0F3AA4d2A59DFb4473dd30f90488c8Ef 1foobar0xf48007ea0F3AA4d2A59DFb4473dd30f90488c8Ef 1foobar0xf48007ea0F3AA4d2A59DFb4473dd30f90488c8Ef foobar --home upgrade-tests/data/validator1 -y --from validator1 --keyring-backend test --chain-id gravity-test
 ```
 
 # Useful commands
@@ -106,7 +106,7 @@ npx ts-node scripts/get-dummy-balance.ts
 
 # Add new evm chain
 gravity tx gravity add-evm-chain "goerli network 2nd" "foobar" "421" "defaultgravityid" "add goerli network 2nd" 100000000uoraib "foobar" --from validator1 --home e2e/data/validator1/ -y --keyring-backend test --chain-id gravity-test -b block --gas 2000000
-gravity tx gov vote 1 yes --from validator1 --home e2e/data/validator1/ -y
+gravity tx gov vote 1 yes --from validator1 --home e2e/data/validator1/ -y --keyring-backend test --chain-id gravity-test -b block
 ```
 
 <!-- oraid tx ibc-transfer transfer transfer channel-0 oraib1kvx7v59g9e8zvs7e8jm2a8w4mtp9ys2sjufdm4 1orai --from validator -y -->

module/Makefile

@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 PACKAGES=$(shell go list ./... | grep -v '/simulation')
-VERSION := $(shell git describe --abbrev=6 --dirty --always --tags)
+VERSION := $(shell git describe --abbrev=30 --dirty --always --tags)
 COMMIT := $(shell git log -1 --format='%H')
 DOCKER := $(shell which docker)
 DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace bufbuild/buf

module/app/upgrades/pleiades/handler.go

@@ -27,7 +27,7 @@ func GetPleiadesUpgradeHandler(
 			{
 				EvmChainPrefix:     EthereumChainPrefix,
 				EvmChainName:       "Binance Smart Chain",
-				EvmChainNetVersion: 5,
+				EvmChainNetVersion: 56,
 			},
 		}
 

module/proto/gravity/v1/types.proto

@@ -114,6 +114,7 @@ message AddEvmChainProposal {
   string evm_chain_prefix = 4;
   uint64 evm_chain_net_version = 5;
   string gravity_id = 6;
+  string bridge_ethereum_address = 7;
 }
 
 // PendingIbcAutoForward represents a SendToCosmos transaction with a foreign CosmosReceiver which will be added to the

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

@@ -306,17 +306,17 @@ func CmdGovUnhaltBridgeProposal() *cobra.Command {
 func CmdAddEvmChainProposal() *cobra.Command {
 	// nolint: exhaustruct
 	cmd := &cobra.Command{
-		Use:   "add-evm-chain [evm-chain-name] [evm-chain-prefix] [evm-chain-net-version] [evm-chain-gravity-id] [title] [initial-deposit] [description]",
+		Use:   "add-evm-chain [evm-chain-name] [evm-chain-prefix] [evm-chain-net-version] [evm-chain-gravity-id] [evm-chain-bridge-eth-address] [title] [initial-deposit] [description]",
 		Short: "Creates a governance proposal to support a new EVM chain on the network",
-		Args:  cobra.ExactArgs(7),
+		Args:  cobra.ExactArgs(8),
 		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[5])
+			initialDeposit, err := sdk.ParseCoinsNormalized(args[6])
 			if err != nil {
 				return sdkerrors.Wrap(err, "bad initial deposit amount")
 			}
@@ -332,8 +332,9 @@ func CmdAddEvmChainProposal() *cobra.Command {
 				return fmt.Errorf("EVM chain net version should be an unsigned integer")
 			}
 			gravityId := args[3]
+			bridgeEthAddress := args[4]
 
-			proposal := &types.AddEvmChainProposal{EvmChainName: evmChainName, EvmChainPrefix: evmChainPrefix, EvmChainNetVersion: evmChainNetVersion, GravityId: gravityId, Title: args[4], Description: args[6]}
+			proposal := &types.AddEvmChainProposal{EvmChainName: evmChainName, EvmChainPrefix: evmChainPrefix, EvmChainNetVersion: evmChainNetVersion, GravityId: gravityId, BridgeEthereumAddress: bridgeEthAddress, Title: args[5], Description: args[7]}
 			proposalAny, err := codectypes.NewAnyWithValue(proposal)
 			if err != nil {
 				return sdkerrors.Wrap(err, "invalid metadata or proposal details!")
@@ -399,7 +400,7 @@ func CmdSendToEth() *cobra.Command {
 				Amount:         amount[0],
 				BridgeFee:      bridgeFee[0],
 				ChainFee:       chainFee[0],
-				EvmChainPrefix: args[3],
+				EvmChainPrefix: args[4],
 			}
 			if err := msg.ValidateBasic(); err != nil {
 				return err

module/x/gravity/keeper/attestation.go

@@ -441,9 +441,9 @@ func (k Keeper) SetLastEventNonceByValidator(ctx sdk.Context, evmChainPrefix str
 }
 
 // IterateValidatorLastEventNonces iterates through all batch confirmations
-func (k Keeper) IterateValidatorLastEventNonces(ctx sdk.Context, cb func(key []byte, nonce uint64) (stop bool)) {
+func (k Keeper) IterateValidatorLastEventNonces(ctx sdk.Context, evmChainPrefix string, cb func(key []byte, nonce uint64) (stop bool)) {
 	store := ctx.KVStore(k.storeKey)
-	prefixStore := prefix.NewStore(store, types.LastEventNonceByValidatorKey)
+	prefixStore := prefix.NewStore(store, types.AppendChainPrefix(types.LastEventNonceByValidatorKey, evmChainPrefix))
 	iter := prefixStore.Iterator(nil, nil)
 
 	defer iter.Close()

module/x/gravity/keeper/cosmos-originated.go

@@ -36,9 +36,9 @@ func (k Keeper) GetCosmosOriginatedERC20(ctx sdk.Context, evmChainPrefix string,
 
 // IterateCosmosOriginatedERC20s iterates through every erc20 under DenomToERC20Key, passing it to the given callback.
 // cb should return true to stop iteration, false to continue
-func (k Keeper) IterateCosmosOriginatedERC20s(ctx sdk.Context, cb func(key []byte, erc20 *types.EthAddress) (stop bool)) {
+func (k Keeper) IterateCosmosOriginatedERC20s(ctx sdk.Context, evmChainPrefix string, cb func(key []byte, erc20 *types.EthAddress) (stop bool)) {
 	store := ctx.KVStore(k.storeKey)
-	prefixStore := prefix.NewStore(store, types.DenomToERC20Key)
+	prefixStore := prefix.NewStore(store, types.AppendChainPrefix(types.DenomToERC20Key, evmChainPrefix))
 	iter := prefixStore.Iterator(nil, nil)
 
 	defer iter.Close()

module/x/gravity/keeper/evidence.go

@@ -24,13 +24,8 @@ func (k Keeper) CheckBadSignatureEvidence(
 	}
 
 	switch subject := subject.(type) {
-	case *types.OutgoingTxBatch:
+	case *types.OutgoingTxBatch, *types.Valset, *types.OutgoingLogicCall:
 		return k.checkBadSignatureEvidenceInternal(ctx, msg.EvmChainPrefix, subject, msg.Signature)
-	case *types.Valset:
-		return k.checkBadSignatureEvidenceInternal(ctx, msg.EvmChainPrefix, subject, msg.Signature)
-	case *types.OutgoingLogicCall:
-		return k.checkBadSignatureEvidenceInternal(ctx, msg.EvmChainPrefix, subject, msg.Signature)
-
 	default:
 		return sdkerrors.Wrap(types.ErrInvalid, fmt.Sprintf("Bad signature must be over a batch, valset, or logic call got %s", subject))
 	}
@@ -95,15 +90,11 @@ func (k Keeper) SetPastEthSignatureCheckpoint(ctx sdk.Context, evmChainPrefix st
 // GetPastEthSignatureCheckpoint tells you whether a given checkpoint has ever existed
 func (k Keeper) GetPastEthSignatureCheckpoint(ctx sdk.Context, evmChainPrefix string, checkpoint []byte) (found bool) {
 	store := ctx.KVStore(k.storeKey)
-	if bytes.Equal(store.Get(types.GetPastEvmSignatureCheckpointKey(evmChainPrefix, checkpoint)), []byte{0x1}) {
-		return true
-	} else {
-		return false
-	}
+	return bytes.Equal(store.Get(types.GetPastEvmSignatureCheckpointKey(evmChainPrefix, checkpoint)), []byte{0x1})
 }
 
-func (k Keeper) IteratePastEthSignatureCheckpoints(ctx sdk.Context, cb func(key []byte, value []byte) (stop bool)) {
-	prefixStore := prefix.NewStore(ctx.KVStore(k.storeKey), types.PastEthSignatureCheckpointKey)
+func (k Keeper) IteratePastEthSignatureCheckpoints(ctx sdk.Context, evmChainPrefix string, cb func(key []byte, value []byte) (stop bool)) {
+	prefixStore := prefix.NewStore(ctx.KVStore(k.storeKey), types.AppendChainPrefix(types.PastEvmSignatureCheckpointKey, evmChainPrefix))
 	iter := prefixStore.Iterator(nil, nil)
 	defer iter.Close()
 

module/x/gravity/keeper/genesis.go

@@ -72,12 +72,18 @@ func initBridgeDataFromGenesis(ctx sdk.Context, k Keeper, data types.EvmChainDat
 			panic("couldn't cast to claim")
 		}
 
-		// TODO: block height?
+		// block height?
+		if claim.GetEthBlockHeight() == 0 {
+			panic("eth block height can not be zero")
+		}
 		hash, err := claim.ClaimHash()
 		if err != nil {
 			panic(fmt.Errorf("error when computing ClaimHash for %v", hash))
 		}
-		k.SetAttestation(ctx, evmChainPrefix, claim.GetEventNonce(), hash, &att)
+		// these claims always have the same evmChainPrefix even not set
+		claim.SetEvmChainPrefix(evmChainPrefix)
+
+		k.SetAttestation(ctx, claim.GetEvmChainPrefix(), claim.GetEventNonce(), hash, &att)
 	}
 
 	// reset attestation state of specific validators
@@ -254,8 +260,9 @@ func ExportGenesis(ctx sdk.Context, k Keeper) types.GenesisState {
 
 		evmChains[ci] = types.EvmChainData{
 			EvmChain: types.EvmChain{
-				EvmChainPrefix: evmChain.EvmChainPrefix,
-				EvmChainName:   evmChain.EvmChainName,
+				EvmChainNetVersion: evmChain.EvmChainNetVersion,
+				EvmChainPrefix:     evmChain.EvmChainPrefix,
+				EvmChainName:       evmChain.EvmChainName,
 			},
 			GravityNonces: types.GravityNonces{
 				LatestValsetNonce:          k.GetLatestValsetNonce(ctx, evmChain.EvmChainPrefix),

module/x/gravity/keeper/governance_proposals.go

@@ -116,13 +116,20 @@ func (k Keeper) HandleAddEvmChainProposal(ctx sdk.Context, p *types.AddEvmChainP
 
 	initBridgeDataFromGenesis(ctx, k, evmChain)
 
+	// check bridge address, if invalid then we set default to 0x0
+	finalEthAddress := p.BridgeEthereumAddress
+	err := types.ValidateEthAddress(p.BridgeEthereumAddress)
+	if err != nil {
+		finalEthAddress = "0x0000000000000000000000000000000000000000"
+	}
+
 	// update param to match with the new evm chain
 	params := k.GetParams(ctx)
 	evmChainParam := &types.EvmChainParam{
 		EvmChainPrefix:           p.EvmChainPrefix,
 		GravityId:                p.GravityId,
 		ContractSourceHash:       "",
-		BridgeEthereumAddress:    "0x0000000000000000000000000000000000000000",
+		BridgeEthereumAddress:    finalEthAddress,
 		BridgeChainId:            p.EvmChainNetVersion,
 		AverageEthereumBlockTime: 15000,
 		BridgeActive:             true,

module/x/gravity/keeper/invariants.go

@@ -286,7 +286,7 @@ func ValidateStore(ctx sdk.Context, evmChainPrefix string, k Keeper) error {
 	}
 
 	// OutgoingTXPoolKey
-	k.IterateUnbatchedTransactions(ctx, func(key []byte, tx *types.InternalOutgoingTransferTx) (stop bool) {
+	k.IterateUnbatchedTransactions(ctx, evmChainPrefix, func(key []byte, tx *types.InternalOutgoingTransferTx) (stop bool) {
 		err = tx.ValidateBasic()
 		if err != nil {
 			err = fmt.Errorf("Invalid unbatched transaction %v under key %v in IterateUnbatchedTransactions: %v", tx, key, err)
@@ -325,7 +325,7 @@ func ValidateStore(ctx sdk.Context, evmChainPrefix string, k Keeper) error {
 	}
 
 	// LastEventNonceByValidatorKey (type checked when fetching)
-	k.IterateValidatorLastEventNonces(ctx, func(key []byte, nonce uint64) (stop bool) {
+	k.IterateValidatorLastEventNonces(ctx, evmChainPrefix, func(key []byte, nonce uint64) (stop bool) {
 		return false
 	})
 	if err != nil {
@@ -364,7 +364,7 @@ func ValidateStore(ctx sdk.Context, evmChainPrefix string, k Keeper) error {
 	}
 
 	// KeyOutgoingLogicConfirm
-	k.IterateLogicConfirms(ctx, func(key []byte, confirm *types.MsgConfirmLogicCall) (stop bool) {
+	k.IterateLogicConfirms(ctx, evmChainPrefix, func(key []byte, confirm *types.MsgConfirmLogicCall) (stop bool) {
 		err = confirm.ValidateBasic()
 		if err != nil {
 			err = fmt.Errorf("Invalid logic call confirm %v under key %v in IterateLogicConfirms: %v", confirm, key, err)
@@ -389,7 +389,7 @@ func ValidateStore(ctx sdk.Context, evmChainPrefix string, k Keeper) error {
 	}
 
 	// DenomToERC20Key
-	k.IterateCosmosOriginatedERC20s(ctx, func(key []byte, erc20 *types.EthAddress) (stop bool) {
+	k.IterateCosmosOriginatedERC20s(ctx, evmChainPrefix, func(key []byte, erc20 *types.EthAddress) (stop bool) {
 		if err = erc20.ValidateBasic(); err != nil {
 			err = fmt.Errorf("Discovered invalid cosmos originated erc20 %v under key %v: %v", erc20, key, err)
 			return true
@@ -444,7 +444,7 @@ func ValidateStore(ctx sdk.Context, evmChainPrefix string, k Keeper) error {
 		return fmt.Errorf("Discovered invalid last observed valset %v: %v", valset, err)
 	}
 	// PastEthSignatureCheckpointKey
-	k.IteratePastEthSignatureCheckpoints(ctx, func(key []byte, value []byte) (stop bool) {
+	k.IteratePastEthSignatureCheckpoints(ctx, evmChainPrefix, func(key []byte, value []byte) (stop bool) {
 		// Check is performed in the iterator function
 		return false
 	})

module/x/gravity/keeper/keeper_logic_call.go

@@ -166,8 +166,8 @@ func (k Keeper) IterateLogicConfirmsByInvalidationIDAndNonce(
 // IterateLogicConfirmsByInvalidationIDAndNonce iterates over all logic confirms in the store applying the given
 // callback on each discovered confirm.
 // cb should return true to stop iteration, false to continue
-func (k Keeper) IterateLogicConfirms(ctx sdk.Context, cb func(key []byte, confirm *types.MsgConfirmLogicCall) (stop bool)) {
-	prefix := types.KeyOutgoingLogicConfirm
+func (k Keeper) IterateLogicConfirms(ctx sdk.Context, evmChainPrefix string, cb func(key []byte, confirm *types.MsgConfirmLogicCall) (stop bool)) {
+	prefix := types.AppendChainPrefix(types.KeyOutgoingLogicConfirm, evmChainPrefix)
 	k.iterateLogicConfirmsByPrefix(ctx, prefix, cb)
 }
 

module/x/gravity/keeper/pool.go

@@ -256,8 +256,8 @@ func (k Keeper) IterateUnbatchedTransactionsByContract(ctx sdk.Context, evmChain
 // IterateUnbatchedTransactions iterates through all unbatched transactions in DESC order, executing the given callback
 // on each discovered Tx. Return true in cb to stop iteration, false to continue.
 // For finer grained control, use filterAndIterateUnbatchedTransactions or one of the above methods
-func (k Keeper) IterateUnbatchedTransactions(ctx sdk.Context, cb func(key []byte, tx *types.InternalOutgoingTransferTx) (stop bool)) {
-	k.filterAndIterateUnbatchedTransactions(ctx, types.OutgoingTXPoolKey, cb)
+func (k Keeper) IterateUnbatchedTransactions(ctx sdk.Context, evmChainPrefix string, cb func(key []byte, tx *types.InternalOutgoingTransferTx) (stop bool)) {
+	k.filterAndIterateUnbatchedTransactions(ctx, types.AppendChainPrefix(types.OutgoingTXPoolKey, evmChainPrefix), cb)
 }
 
 // filterAndIterateUnbatchedTransactions iterates through all unbatched transactions whose keys begin with prefixKey in DESC order

module/x/gravity/keeper/test_common.go

@@ -230,7 +230,7 @@ var (
 
 	EvmChains = []types.EvmChain{
 		{EvmChainPrefix: EthChainPrefix, EvmChainName: "Ethereum Mainnet", EvmChainNetVersion: 1},
-		{EvmChainPrefix: BscChainPrefix, EvmChainName: "BSC Mainnet", EvmChainNetVersion: 2},
+		{EvmChainPrefix: BscChainPrefix, EvmChainName: "BSC Mainnet", EvmChainNetVersion: 56},
 	}
 )
 

module/x/gravity/migrations/v3/store.go

@@ -235,7 +235,6 @@ func migrateLastObservedEvmBlockHeight(ctx sdk.Context, store sdk.KVStore, cdc c
 	}
 
 	if len(bytes) > 0 {
-		println("bytes", string(bytes))
 		cdc.MustUnmarshal(bytes, &height)
 	}
 	if observed && claimHeight > height.EthereumBlockHeight {

module/x/gravity/migrations/v4/migrate.go

@@ -1,8 +1,6 @@
 package v4
 
 import (
-	"fmt"
-
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
 
@@ -17,14 +15,15 @@ import (
 //
 // - Set the MonitoredTokenAddresses param to an empty slice
 func MigrateParams(ctx sdk.Context, paramSpace paramstypes.Subspace, legacySubspace exported.Subspace) types.Params {
-	ctx.Logger().Info("Pleiades Upgrade part 2: Beginning the migrations for the gravity module")
+	log := ctx.Logger()
+	log.Info("Pleiades Upgrade part 2: Beginning the migrations for the gravity module")
 	v3Params := GetParams(ctx, legacySubspace)
-	fmt.Printf("v3 params: %v\n", v3Params)
+	log.Info("v3 params:", v3Params)
 	v4Params := V3ToV4Params(v3Params)
-	fmt.Printf("v4 params: %v\n", v4Params)
+	log.Info("v4 params:", v4Params)
 	paramSpace.SetParamSet(ctx, &v4Params)
 
-	ctx.Logger().Info("Pleiades Upgrade part 2: Finished the migrations for the gravity module successfully!")
+	log.Info("Pleiades Upgrade part 2: Finished the migrations for the gravity module successfully!")
 	return v4Params
 }
 
@@ -61,7 +60,7 @@ func V3ToV4Params(v3Params v3.Params) types.Params {
 				EvmChainPrefix:           v3.EthereumChainPrefix,
 				GravityId:                v3Params.GravityId,
 				ContractSourceHash:       v3Params.ContractSourceHash,
-				BridgeEthereumAddress:    v3Params.BridgeEthereumAddress,
+				BridgeEthereumAddress:    "0xb40C364e70bbD98E8aaab707A41a52A2eAF5733f",
 				BridgeChainId:            v3Params.BridgeChainId,
 				AverageEthereumBlockTime: v3Params.AverageEthereumBlockTime,
 				BridgeActive:             v3Params.BridgeActive,

module/x/gravity/migrations/v4/migrate_test.go

@@ -105,7 +105,7 @@ func TestMigrateParams(t *testing.T) {
 	v4Subspace.GetParamSet(ctx, &v4Params)
 	fmt.Printf("v4 params in testing: %v\n", v4Params)
 
-	evmChainParam := v4Params.EvmChainParams[0]
+	evmChainParam := v4Params.GetEvmChain(types.GravityDenomPrefix)
 	require.Equal(t, types.GravityDenomPrefix, evmChainParam.EvmChainPrefix)
 	require.Equal(t, params.AverageEthereumBlockTime, evmChainParam.AverageEthereumBlockTime)
 	require.Equal(t, params.GravityId, evmChainParam.GravityId)

module/x/gravity/types/msgs.go

@@ -497,9 +497,6 @@ func (e *MsgBatchSendToEthClaim) ValidateBasic() error {
 	if e.BatchNonce == 0 {
 		return fmt.Errorf("batch_nonce == 0")
 	}
-	if e.EvmChainPrefix == "" {
-		return fmt.Errorf("evm_chain_prefix is empty")
-	}
 	if err := ValidateEthAddress(e.TokenContract); err != nil {
 		return sdkerrors.Wrap(err, "erc20 token")
 	}
@@ -572,9 +569,6 @@ func (e *MsgERC20DeployedClaim) ValidateBasic() error {
 	if e.EventNonce == 0 {
 		return fmt.Errorf("nonce == 0")
 	}
-	if e.EvmChainPrefix == "" {
-		return fmt.Errorf("evm_chain_prefix is empty")
-	}
 	return nil
 }
 
@@ -639,9 +633,6 @@ func (e *MsgLogicCallExecutedClaim) ValidateBasic() error {
 	if e.EventNonce == 0 {
 		return fmt.Errorf("nonce == 0")
 	}
-	if e.EvmChainPrefix == "" {
-		return fmt.Errorf("evm_chain_prefix is empty")
-	}
 	return nil
 }
 
@@ -706,9 +697,6 @@ func (e *MsgValsetUpdatedClaim) ValidateBasic() error {
 	if e.EventNonce == 0 {
 		return fmt.Errorf("nonce == 0")
 	}
-	if e.EvmChainPrefix == "" {
-		return fmt.Errorf("evm_chain_prefix is empty")
-	}
 	err := ValidateEthAddress(e.RewardToken)
 	if err != nil {
 		return err