Update ibc-go to v8 (#134)

* Update to ibc-go-v8 Signed-off-by: Dongri Jin <[email protected]> * Add AppModules Signed-off-by: Dongri Jin <[email protected]> * Fix parseMsgEventLogs Signed-off-by: Dongri Jin <[email protected]> * Remote WithTxConfig Signed-off-by: Dongri Jin <[email protected]> * Fix signmode Signed-off-by: Dongri Jin <[email protected]> * Fix simapp Signed-off-by: Dongri Jin <[email protected]> * Fix txConfig Signed-off-by: Dongri Jin <[email protected]> * Use ibc-mock-clinet v0.3.4 Signed-off-by: Dongri Jin <[email protected]> * Use sdk context Signed-off-by: Dongri Jin <[email protected]> * * Remove types from simp * Fix msgIndex logic Signed-off-by: Dongri Jin <[email protected]> * Fix simapp Signed-off-by: Dongri Jin <[email protected]> * Reduce the diff Signed-off-by: Dongri Jin <[email protected]> * Remove homePath parameter Signed-off-by: Dongri Jin <[email protected]> * Reduce the diff Signed-off-by: Dongri Jin <[email protected]> * Fix msgIndexOf func Signed-off-by: Dongri Jin <[email protected]> * Add upgrades.go Signed-off-by: Dongri Jin <[email protected]> * Fix add genesis accounts Signed-off-by: Dongri Jin <[email protected]> * Change golang.org/x/exp/slog to log/slog Signed-off-by: Dongri Jin <[email protected]> * Fix simapp/README.md Signed-off-by: Dongri Jin <[email protected]> --------- Signed-off-by: Dongri Jin <[email protected]>
hyperledger-labs · Apr 2, 2024 · b270f8f · b270f8f
1 parent bf144b0
commit b270f8f
Show file tree

Hide file tree

Showing 47 changed files with 1,661 additions and 1,533 deletions.
diff --git a/chains/tendermint/chain.go b/chains/tendermint/chain.go
@@ -29,8 +29,8 @@ import (
 	authtx "github.com/cosmos/cosmos-sdk/x/auth/tx"
 	authTypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	"github.com/cosmos/go-bip39"
-	clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
-	ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
+	clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types"
+	ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported"
 
 	"github.com/hyperledger-labs/yui-relayer/core"
 	"github.com/hyperledger-labs/yui-relayer/log"
@@ -230,7 +230,7 @@ func (c *Chain) rawSendMsgs(msgs []sdk.Msg) (*sdk.TxResponse, bool, error) {
 	}
 
 	// Attach the signature to the transaction
-	err = tx.Sign(txf, c.config.Key, txb, false)
+	err = tx.Sign(context.TODO(), txf, c.config.Key, txb, false)
 	if err != nil {
 		return nil, false, err
 	}
@@ -447,14 +447,8 @@ func (c *Chain) GetMsgResult(id core.MsgID) (core.MsgResult, error) {
 		}, nil
 	}
 
-	// parse the log into ABCI logs
-	abciLogs, err := sdk.ParseABCILogs(resTx.TxResult.Log)
-	if err != nil {
-		return nil, fmt.Errorf("failed to parse ABCI logs: %v", err)
-	}
-
-	// parse the ABCI logs into core.MsgEventLog's
-	events, err := parseMsgEventLogs(abciLogs, msgID.MsgIndex)
+	// parse the abci.types.Events into core.MsgEventLog's
+	events, err := parseMsgEventLogs(resTx.TxResult.Events, msgID.MsgIndex)
 	if err != nil {
 		return nil, fmt.Errorf("failed to parse msg event log: %v", err)
 	}
@@ -514,11 +508,14 @@ func (c *Chain) UseSDKContext() func() {
 
 // CLIContext returns an instance of client.Context derived from Chain
 func (c *Chain) CLIContext(height int64) sdkCtx.Context {
+	unlock := c.UseSDKContext()
+	txConfig := authtx.NewTxConfig(c.codec, authtx.DefaultSignModes)
+	unlock()
 	return sdkCtx.Context{}.
 		WithChainID(c.config.ChainId).
 		WithCodec(c.codec).
 		WithInterfaceRegistry(c.codec.InterfaceRegistry()).
-		WithTxConfig(authtx.NewTxConfig(c.codec, authtx.DefaultSignModes)).
+		WithTxConfig(txConfig).
 		WithInput(os.Stdin).
 		WithNodeURI(c.config.RpcAddr).
 		WithClient(c.Client).

diff --git a/chains/tendermint/client-tx.go b/chains/tendermint/client-tx.go
@@ -4,9 +4,9 @@ import (
 	"time"
 
 	"github.com/cometbft/cometbft/light"
-	clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
-	commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types"
-	tmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint"
+	clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types"
+	commitmenttypes "github.com/cosmos/ibc-go/v8/modules/core/23-commitment/types"
+	tmclient "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint"
 )
 
 func createClient(

diff --git a/chains/tendermint/cmd/light.go b/chains/tendermint/cmd/light.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 
 	"github.com/cosmos/cosmos-sdk/client/flags"
-	tmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint"
+	tmclient "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint"
 	"github.com/hyperledger-labs/yui-relayer/chains/tendermint"
 	"github.com/hyperledger-labs/yui-relayer/config"
 	"github.com/spf13/cobra"

diff --git a/chains/tendermint/light.go b/chains/tendermint/light.go
@@ -18,7 +18,7 @@ import (
 	lighthttp "github.com/cometbft/cometbft/light/provider/http"
 	dbs "github.com/cometbft/cometbft/light/store/db"
 	tmtypes "github.com/cometbft/cometbft/types"
-	tmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint"
+	tmclient "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint"
 )
 
 // NOTE: currently we are discarding the very noisy light client logs

diff --git a/chains/tendermint/msg.go b/chains/tendermint/msg.go
@@ -7,10 +7,10 @@ import (
 	"strconv"
 	"time"
 
-	sdk "github.com/cosmos/cosmos-sdk/types"
-	clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
-	conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types"
-	chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
+	abcitypes "github.com/cometbft/cometbft/abci/types"
+	clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types"
+	conntypes "github.com/cosmos/ibc-go/v8/modules/core/03-connection/types"
+	chantypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types"
 	"github.com/hyperledger-labs/yui-relayer/core"
 )
 
@@ -19,6 +19,10 @@ var (
 	_ core.MsgResult = (*MsgResult)(nil)
 )
 
+const (
+	MsgIndexAttributeKey = "msg_index"
+)
+
 func (*MsgID) Is_MsgID() {}
 
 type MsgResult struct {
@@ -44,23 +48,35 @@ func (r *MsgResult) Events() []core.MsgEventLog {
 	return r.events
 }
 
-func parseMsgEventLogs(logs sdk.ABCIMessageLogs, msgIndex uint32) ([]core.MsgEventLog, error) {
+func parseMsgEventLogs(events []abcitypes.Event, msgIndex uint32) ([]core.MsgEventLog, error) {
 	var msgEventLogs []core.MsgEventLog
-	for _, log := range logs {
-		if msgIndex == log.MsgIndex {
-			for _, ev := range log.Events {
-				event, err := parseMsgEventLog(ev)
-				if err != nil {
-					return nil, fmt.Errorf("failed to parse msg event log: %v", err)
-				}
-				msgEventLogs = append(msgEventLogs, event)
+	for _, ev := range events {
+		index, err := msgIndexOf(ev)
+		if err == nil && index == msgIndex {
+			event, err := parseMsgEventLog(ev)
+			if err != nil {
+				return nil, fmt.Errorf("failed to parse msg event log: %v", err)
 			}
+			msgEventLogs = append(msgEventLogs, event)
 		}
 	}
 	return msgEventLogs, nil
 }
 
-func parseMsgEventLog(ev sdk.StringEvent) (core.MsgEventLog, error) {
+func msgIndexOf(event abcitypes.Event) (uint32, error) {
+	for _, attr := range event.Attributes {
+		if attr.Key == MsgIndexAttributeKey {
+			intValue, err := strconv.ParseUint(attr.Value, 10, 32)
+			if err != nil {
+				return 0, fmt.Errorf("failed to parse value: %v", err)
+			}
+			return uint32(intValue), nil
+		}
+	}
+	return 0, fmt.Errorf("failed to find attribute of key %q", MsgIndexAttributeKey)
+}
+
+func parseMsgEventLog(ev abcitypes.Event) (core.MsgEventLog, error) {
 	switch ev.Type {
 	case clienttypes.EventTypeCreateClient:
 		clientID, err := getAttributeString(ev, clienttypes.AttributeKeyClientID)
@@ -134,7 +150,7 @@ func parseMsgEventLog(ev sdk.StringEvent) (core.MsgEventLog, error) {
 	}
 }
 
-func getAttributeString(ev sdk.StringEvent, key string) (string, error) {
+func getAttributeString(ev abcitypes.Event, key string) (string, error) {
 	for _, attr := range ev.Attributes {
 		if attr.Key == key {
 			return attr.Value, nil
@@ -143,7 +159,7 @@ func getAttributeString(ev sdk.StringEvent, key string) (string, error) {
 	return "", fmt.Errorf("failed to find attribute of key %q", key)
 }
 
-func getAttributeBytes(ev sdk.StringEvent, key string) ([]byte, error) {
+func getAttributeBytes(ev abcitypes.Event, key string) ([]byte, error) {
 	v, err := getAttributeString(ev, key)
 	if err != nil {
 		return nil, err
@@ -155,7 +171,7 @@ func getAttributeBytes(ev sdk.StringEvent, key string) ([]byte, error) {
 	return bz, nil
 }
 
-func getAttributeHeight(ev sdk.StringEvent, key string) (clienttypes.Height, error) {
+func getAttributeHeight(ev abcitypes.Event, key string) (clienttypes.Height, error) {
 	v, err := getAttributeString(ev, key)
 	if err != nil {
 		return clienttypes.Height{}, err
@@ -167,7 +183,7 @@ func getAttributeHeight(ev sdk.StringEvent, key string) (clienttypes.Height, err
 	return height, nil
 }
 
-func getAttributeUint64(ev sdk.StringEvent, key string) (uint64, error) {
+func getAttributeUint64(ev abcitypes.Event, key string) (uint64, error) {
 	v, err := getAttributeString(ev, key)
 	if err != nil {
 		return 0, err
@@ -179,7 +195,7 @@ func getAttributeUint64(ev sdk.StringEvent, key string) (uint64, error) {
 	return d, nil
 }
 
-func getAttributeTimestamp(ev sdk.StringEvent, key string) (time.Time, error) {
+func getAttributeTimestamp(ev abcitypes.Event, key string) (time.Time, error) {
 	d, err := getAttributeUint64(ev, key)
 	if err != nil {
 		return time.Time{}, err

diff --git a/chains/tendermint/prover.go b/chains/tendermint/prover.go
@@ -10,10 +10,10 @@ import (
 	"github.com/cometbft/cometbft/types"
 	tmtypes "github.com/cometbft/cometbft/types"
 	"github.com/cosmos/cosmos-sdk/codec"
-	clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
-	ibcclient "github.com/cosmos/ibc-go/v7/modules/core/client"
-	ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
-	tmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint"
+	clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types"
+	ibcclient "github.com/cosmos/ibc-go/v8/modules/core/client"
+	ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported"
+	tmclient "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint"
 
 	"github.com/hyperledger-labs/yui-relayer/core"
 )

diff --git a/chains/tendermint/query.go b/chains/tendermint/query.go
@@ -17,15 +17,15 @@ import (
 	querytypes "github.com/cosmos/cosmos-sdk/types/query"
 	bankTypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
-	transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
-	clientutils "github.com/cosmos/ibc-go/v7/modules/core/02-client/client/utils"
-	clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
-	connutils "github.com/cosmos/ibc-go/v7/modules/core/03-connection/client/utils"
-	conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types"
-	chanutils "github.com/cosmos/ibc-go/v7/modules/core/04-channel/client/utils"
-	chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
-	committypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types"
-	ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
+	transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types"
+	clientutils "github.com/cosmos/ibc-go/v8/modules/core/02-client/client/utils"
+	clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types"
+	connutils "github.com/cosmos/ibc-go/v8/modules/core/03-connection/client/utils"
+	conntypes "github.com/cosmos/ibc-go/v8/modules/core/03-connection/types"
+	chanutils "github.com/cosmos/ibc-go/v8/modules/core/04-channel/client/utils"
+	chantypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types"
+	committypes "github.com/cosmos/ibc-go/v8/modules/core/23-commitment/types"
+	ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported"
 	"github.com/hyperledger-labs/yui-relayer/core"
 )
 
@@ -121,7 +121,7 @@ func (c *Chain) QueryBalance(ctx core.QueryContext, addr sdk.AccAddress) (sdk.Co
 		Offset:     0,
 		Limit:      1000,
 		CountTotal: true,
-	})
+	}, true)
 
 	queryClient := bankTypes.NewQueryClient(c.CLIContext(0))
 
@@ -414,7 +414,7 @@ func (c *Chain) QueryValsetAtHeight(height clienttypes.Height) (*tmproto.Validat
 	return protoValSet, err
 }
 
-func (c *Chain) toTmValidators(vals stakingtypes.Validators) ([]*tmtypes.Validator, error) {
+func (c *Chain) toTmValidators(vals []stakingtypes.Validator) ([]*tmtypes.Validator, error) {
 	validators := make([]*tmtypes.Validator, len(vals))
 	var err error
 	for i, val := range vals {

diff --git a/cmd/query.go b/cmd/query.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
-	ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
+	clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types"
+	ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported"
 	"github.com/hyperledger-labs/yui-relayer/config"
 	"github.com/hyperledger-labs/yui-relayer/core"
 	"github.com/hyperledger-labs/yui-relayer/helpers"

diff --git a/cmd/tx.go b/cmd/tx.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 
 	"github.com/cosmos/cosmos-sdk/client/flags"
-	clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
-	"github.com/cosmos/ibc-go/v7/modules/core/exported"
+	clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types"
+	"github.com/cosmos/ibc-go/v8/modules/core/exported"
 	"github.com/hyperledger-labs/yui-relayer/config"
 	"github.com/hyperledger-labs/yui-relayer/core"
 	"github.com/spf13/cobra"

diff --git a/cmd/xfer.go b/cmd/xfer.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
+	transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types"
 	"github.com/hyperledger-labs/yui-relayer/config"
 	"github.com/hyperledger-labs/yui-relayer/core"
 	"github.com/spf13/cobra"

diff --git a/core/chain.go b/core/chain.go
@@ -6,11 +6,11 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
-	clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
-	conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types"
-	chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
-	ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
+	transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types"
+	clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types"
+	conntypes "github.com/cosmos/ibc-go/v8/modules/core/03-connection/types"
+	chantypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types"
+	ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported"
 	"github.com/hyperledger-labs/yui-relayer/log"
 )
 

diff --git a/core/channel.go b/core/channel.go
@@ -3,12 +3,12 @@ package core
 import (
 	"context"
 	"fmt"
+	"log/slog"
 	"time"
 
 	retry "github.com/avast/retry-go"
-	chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
+	chantypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types"
 	"github.com/hyperledger-labs/yui-relayer/log"
-	"golang.org/x/exp/slog"
 )
 
 // CreateChannel runs the channel creation messages on timeout until they pass

diff --git a/core/client.go b/core/client.go
@@ -5,8 +5,8 @@ import (
 	"time"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
-	"github.com/cosmos/ibc-go/v7/modules/core/exported"
+	clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types"
+	"github.com/cosmos/ibc-go/v8/modules/core/exported"
 	"github.com/hyperledger-labs/yui-relayer/log"
 )
 

diff --git a/core/codec.go b/core/codec.go
@@ -1,17 +1,17 @@
 package core
 
 import (
+	"cosmossdk.io/x/evidence"
+	"cosmossdk.io/x/upgrade"
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/cosmos/cosmos-sdk/std"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	"github.com/cosmos/cosmos-sdk/x/auth"
 	"github.com/cosmos/cosmos-sdk/x/auth/vesting"
 	"github.com/cosmos/cosmos-sdk/x/bank"
-	"github.com/cosmos/cosmos-sdk/x/capability"
 	"github.com/cosmos/cosmos-sdk/x/crisis"
 	distr "github.com/cosmos/cosmos-sdk/x/distribution"
-	"github.com/cosmos/cosmos-sdk/x/evidence"
 	"github.com/cosmos/cosmos-sdk/x/genutil"
 	"github.com/cosmos/cosmos-sdk/x/gov"
 	govclient "github.com/cosmos/cosmos-sdk/x/gov/client"
@@ -20,11 +20,10 @@ import (
 	paramsclient "github.com/cosmos/cosmos-sdk/x/params/client"
 	"github.com/cosmos/cosmos-sdk/x/slashing"
 	"github.com/cosmos/cosmos-sdk/x/staking"
-	"github.com/cosmos/cosmos-sdk/x/upgrade"
-	upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client"
-	transfer "github.com/cosmos/ibc-go/v7/modules/apps/transfer"
-	ibc "github.com/cosmos/ibc-go/v7/modules/core"
-	tmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint"
+	"github.com/cosmos/ibc-go/modules/capability"
+	transfer "github.com/cosmos/ibc-go/v8/modules/apps/transfer"
+	ibc "github.com/cosmos/ibc-go/v8/modules/core"
+	tmclient "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint"
 )
 
 var moduleBasics = module.NewBasicManager(
@@ -38,8 +37,6 @@ var moduleBasics = module.NewBasicManager(
 	gov.NewAppModuleBasic(
 		[]govclient.ProposalHandler{
 			paramsclient.ProposalHandler,
-			upgradeclient.LegacyProposalHandler,
-			upgradeclient.LegacyCancelProposalHandler,
 		},
 	),
 	params.AppModuleBasic{},

diff --git a/core/connection.go b/core/connection.go
@@ -4,15 +4,15 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"log/slog"
 	"time"
 
 	retry "github.com/avast/retry-go"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
-	conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types"
-	ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
+	clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types"
+	conntypes "github.com/cosmos/ibc-go/v8/modules/core/03-connection/types"
+	ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported"
 	"github.com/hyperledger-labs/yui-relayer/log"
-	"golang.org/x/exp/slog"
 )
 
 var (