Merge branch 'main' into add-default-entrypoint

cmd/tx.go

@@ -1214,7 +1214,7 @@ func ensureKeysExist(chains map[string]*relayer.Chain) error {
 	return nil
 }
 
-// MsgRegisterCounterpartyPayee registers the counterparty_payee
+// registerCounterpartyCmd registers the counterparty_payee
 func registerCounterpartyCmd(a *appState) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:     "register-counterparty chain_name channel_id port_id relay_addr counterparty_payee",

relayer/chains/cosmos/account.go

@@ -58,10 +58,8 @@ func (cc *CosmosProvider) GetAccountWithHeight(_ client.Context, addr sdk.AccAdd
 
 // EnsureExists returns an error if no account exists for the given address else nil.
 func (cc *CosmosProvider) EnsureExists(clientCtx client.Context, addr sdk.AccAddress) error {
-	if _, err := cc.GetAccount(clientCtx, addr); err != nil {
-		return err
-	}
-	return nil
+	_, err := cc.GetAccount(clientCtx, addr)
+	return err
 }
 
 // GetAccountNumberSequence returns sequence and account number for the given address.

relayer/chains/cosmos/fee_market_test.go

@@ -15,7 +15,7 @@ var (
 		Key:              "default",
 		ChainName:        "osmosis",
 		ChainID:          "osmosis-1",
-		RPCAddr:          "https://rpc.osmosis.strange.love:443",
+		RPCAddr:          "https://osmosis-rpc.polkachu.com:443",
 		AccountPrefix:    "osmo",
 		KeyringBackend:   "test",
 		DynamicGasPrice:  true,

relayer/chains/cosmos/keys.go

@@ -180,10 +180,7 @@ func (cc *CosmosProvider) ListAddresses() (map[string]string, error) {
 
 // DeleteKey removes a key from the keystore for the specified name.
 func (cc *CosmosProvider) DeleteKey(name string) error {
-	if err := cc.Keybase.Delete(name); err != nil {
-		return err
-	}
-	return nil
+	return cc.Keybase.Delete(name)
 }
 
 // KeyExists returns true if a key with the specified name exists in the keystore, it returns false otherwise.

relayer/chains/cosmos/tx.go

@@ -1676,10 +1676,7 @@ func (cc *CosmosProvider) PrepareFactory(txf tx.Factory, signingKey string) (tx.
 
 	// Set the account number and sequence on the transaction factory and retry if fail
 	if err = retry.Do(func() error {
-		if err = txf.AccountRetriever().EnsureExists(cliCtx, from); err != nil {
-			return err
-		}
-		return err
+		return txf.AccountRetriever().EnsureExists(cliCtx, from)
 	}, rtyAtt, rtyDel, rtyErr); err != nil {
 		return txf, err
 	}