cleanup more

client/relayer/codec.go

@@ -52,7 +52,6 @@ var ModuleBasics = []module.AppModuleBasic{
 	upgrade.AppModuleBasic{},
 	transfer.AppModuleBasic{},
 	ibc.AppModuleBasic{},
-	AppModuleBasic{},
 	stride.AppModuleBasic{},
 	ibcfee.AppModuleBasic{},
 }
@@ -64,7 +63,7 @@ type Codec struct {
 	Amino             *codec.LegacyAmino
 }
 
-func MakeCodec(moduleBasics []module.AppModuleBasic, extraCodecs []string, accBech32Prefix, valBech32Prefix string) Codec {
+func MakeCodec(moduleBasics []module.AppModuleBasic, accBech32Prefix, valBech32Prefix string) Codec {
 	modBasic := module.NewBasicManager(moduleBasics...)
 	encodingConfig := MakeCodecConfig(accBech32Prefix, valBech32Prefix)
 	std.RegisterLegacyAminoCodec(encodingConfig.Amino)

client/relayer/provider.go

@@ -6,7 +6,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/crypto/keyring"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
-	commitmenttypes "github.com/cosmos/ibc-go/v8/modules/core/23-commitment/types"
 	"github.com/cosmos/relayer/v2/relayer/codecs/ethermint"
 	"github.com/strangelove-ventures/cometbft-client/client"
 	"go.uber.org/zap"
@@ -68,28 +67,15 @@ type CosmosProvider struct {
 	Keybase        keyring.Keyring
 	KeyringOptions []keyring.Option
 	RPCClient      RPCClient
-	//LightProvider  provtypes.Provider
-	Input  io.Reader
-	Output io.Writer
-	Cdc    Codec
-
-	//nextAccountSeq uint64
-	feegrantMu sync.Mutex
+	Input          io.Reader
+	Output         io.Writer
+	Cdc            Codec
+	feegrantMu     sync.Mutex
 
 	// the map key is the TX signer, which can either be 'default' (provider key) or a feegrantee
 	// the purpose of the map is to lock on the signer from TX creation through submission,
 	// thus making TX sequencing errors less likely.
 	walletStateMap map[string]*WalletState
-
-	// metrics to monitor the provider
-	TotalFees   sdk.Coins
-	totalFeesMu sync.Mutex
-
-	// for comet < v0.37, decode tm events as base64 todo remove this
-	cometLegacyEncoding bool
-
-	// for comet < v0.38, use legacy RPC client for ResultsBlockResults todo remove this
-	cometLegacyBlockResults bool
 }
 
 func (pc CosmosProviderConfig) BroadcastMode() BroadcastMode {
@@ -125,7 +111,7 @@ func (pc CosmosProviderConfig) NewProvider(log *zap.Logger, homepath string, cha
 		walletStateMap: map[string]*WalletState{},
 
 		// TODO: this is a bit of a hack, we should probably have a better way to inject modules
-		Cdc: MakeCodec(pc.Modules, pc.ExtraCodecs, pc.AccountPrefix, pc.AccountPrefix+"valoper"),
+		Cdc: MakeCodec(pc.Modules, pc.AccountPrefix, pc.AccountPrefix+"valoper"),
 	}
 
 	return cp, nil
@@ -167,11 +153,6 @@ func (cc *CosmosProvider) Timeout() string {
 	return cc.PCfg.Timeout
 }
 
-// CommitmentPrefix returns the commitment prefix for Cosmos
-func (cc *CosmosProvider) CommitmentPrefix() commitmenttypes.MerklePrefix {
-	return defaultChainPrefix
-}
-
 // Address returns the chains configured address as a string
 func (cc *CosmosProvider) Address() (string, error) {
 	info, err := cc.Keybase.Key(cc.PCfg.Key)
@@ -200,20 +181,6 @@ func (cc *CosmosProvider) MustEncodeAccAddr(addr sdk.AccAddress) string {
 	return enc
 }
 
-// AccountFromKeyOrAddress returns an account from either a key or an address.
-// If 'keyOrAddress' is the empty string, this returns the default key's address.
-func (cc *CosmosProvider) AccountFromKeyOrAddress(keyOrAddress string) (out sdk.AccAddress, err error) {
-	switch {
-	case keyOrAddress == "":
-		out, err = cc.GetKeyAddress(cc.PCfg.Key)
-	case cc.KeyExists(keyOrAddress):
-		out, err = cc.GetKeyAddress(keyOrAddress)
-	default:
-		out, err = sdk.GetFromBech32(keyOrAddress, cc.PCfg.AccountPrefix)
-	}
-	return
-}
-
 // SetRpcAddr sets the rpc-addr for the chain.
 // It will fail if the rpcAddr is invalid(not a url).
 func (cc *CosmosProvider) SetRpcAddr(rpcAddr string) error {
@@ -248,15 +215,9 @@ func (cc *CosmosProvider) Init(ctx context.Context) error {
 		return err
 	}
 
-	//lightprovider, err := prov.New(cc.PCfg.ChainID, cc.PCfg.RPCAddr) todo check if needed
-	//if err != nil {
-	//	return err
-	//}
-
 	rpcClient := NewRPCClient(c)
 
 	cc.RPCClient = rpcClient
-	//cc.LightProvider = lightprovider
 	cc.Keybase = keybase
 
 	return nil

client/relayer/query.go

@@ -3,7 +3,6 @@
 import (
 	"context"
 	"fmt"
-	abci "github.com/cometbft/cometbft/abci/types"
 	"github.com/cosmos/cosmos-sdk/x/params/types/proposal"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 	"strconv"
@@ -43,7 +42,7 @@
 		return consumerUnbondingPeriod, nil
 	}
 
 	//Attempt Staking query.
 	unbondingPeriod, stakingParamsErr := cc.queryParamsSubspaceTime(ctx, "staking", "UnbondingTime")
 	if stakingParamsErr == nil {
 		return unbondingPeriod, nil
@@ -61,23 +60,3 @@
 	return 0,
 		fmt.Errorf("failed to query unbonding period from ccvconsumer, staking & fallback : %w: %s : %s", consumerErr, stakingParamsErr.Error(), err.Error())
 }
-
-// parseEventsFromResponseDeliverTx parses the events from a ResponseDeliverTx and builds a slice
-// of provider.RelayerEvent's.
-func parseEventsFromResponseDeliverTx(events []abci.Event) []RelayerEvent {
-	var rlyEvents []RelayerEvent
-
-	for _, event := range events {
-		attributes := make(map[string]string)
-		for _, attribute := range event.Attributes {
-			attributes[attribute.Key] = attribute.Value
-		}
-
-		rlyEvents = append(rlyEvents, RelayerEvent{
-			EventType:  event.Type,
-			Attributes: attributes,
-		})
-	}
-
-	return rlyEvents
-}

client/relayer/tx.go

@@ -29,7 +29,6 @@
 	"time"
 
 	"github.com/avast/retry-go/v4"
-	commitmenttypes "github.com/cosmos/ibc-go/v8/modules/core/23-commitment/types"
 )
 
 // Variables used for retries
@@ -43,15 +42,8 @@
 	errUnknown                  = "unknown"
 )
 
-// Default IBC settings
-var (
-	defaultChainPrefix = commitmenttypes.NewMerklePrefix([]byte("ibc"))
-)
-
 // Strings for parsing events
 var (
-	spTag      = "send_packet"
-	waTag      = "write_acknowledgement"
 	srcChanTag = "packet_src_channel"
 	dstChanTag = "packet_dst_channel"
 )
@@ -196,7 +188,7 @@
 
 	if len(callbacks) > 0 {
 		for _, cb := range callbacks {
 			//Call each callback in order since waitForTx is already invoked asyncronously
 			cb(rlyResp, nil)
 		}
 	}