Merge branch 'main' into main

cosmos · Jul 25, 2023 · e6f6475 · e6f6475
2 parents 3febd1b + 73d338a
commit e6f6475
Show file tree

Hide file tree

Showing 10 changed files with 3,185 additions and 1,410 deletions.
diff --git a/cmd/tx.go b/cmd/tx.go
@@ -723,6 +723,7 @@ $ %s tx link-then-start demo-path --timeout 5s`, appName, appName)),
 	cmd = initBlockFlag(a.viper, cmd)
 	cmd = processorFlag(a.viper, cmd)
 	cmd = updateTimeFlags(a.viper, cmd)
+	cmd = flushIntervalFlag(a.viper, cmd)
 	return cmd
 }
 

diff --git a/proto/cosmos/crypto/sr25519/keys.proto b/proto/cosmos/crypto/sr25519/keys.proto
@@ -8,13 +8,14 @@ import "gogoproto/gogo.proto";
 // Originally github.com/cosmos/cosmos-sdk/crypto/keys/sr25519
 option go_package = "github.com/cosmos/relayer/v2/relayer/chains/cosmos/keys/sr25519";
 
-option (gogoproto.messagename_all)      = true;
+option (gogoproto.messagename_all) = true;
 option (gogoproto.goproto_stringer_all) = false;
-option (gogoproto.goproto_getters_all)  = false;
+option (gogoproto.goproto_getters_all) = false;
 
 // PubKey defines a sr25519 ECDSA public key.
 message PubKey {
-    option (gogoproto.goproto_stringer) = false;
+  option (gogoproto.goproto_stringer) = false;
 
-    bytes key = 1 [(gogoproto.casttype) = "github.com/cometbft/cometbft/crypto/sr25519.PubKey"];
+  bytes key = 1 [ (gogoproto.casttype) =
+                      "github.com/cometbft/cometbft/crypto/sr25519.PubKey" ];
 }
diff --git a/relayer/chains/cosmos/log.go b/relayer/chains/cosmos/log.go
@@ -1,6 +1,7 @@
 package cosmos
 
 import (
+	"errors"
 	"reflect"
 
 	"github.com/cosmos/cosmos-sdk/codec/types"
@@ -10,6 +11,7 @@ import (
 	transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
 
 	clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
+	chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
 	"github.com/cosmos/relayer/v2/relayer/provider"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
@@ -54,6 +56,12 @@ func (cc *CosmosProvider) LogFailedTx(res *provider.RelayerTxResponse, err error
 	fields = append(fields, msgTypesField(msgs))
 
 	if err != nil {
+
+		if errors.Is(err, chantypes.ErrRedundantTx) {
+			cc.log.Debug("Redundant message(s)", fields...)
+			return
+		}
+
 		// Make a copy since we may continue to the warning
 		errorFields := append(fields, zap.Error(err))
 		cc.log.Error(

diff --git a/relayer/chains/penumbra/core/crypto/v1alpha1/crypto.pb.go b/relayer/chains/penumbra/core/crypto/v1alpha1/crypto.pb.go