diff --git a/.changeset/perky-jars-flash.md b/.changeset/perky-jars-flash.md new file mode 100644 index 00000000..662e89fb --- /dev/null +++ b/.changeset/perky-jars-flash.md @@ -0,0 +1,5 @@ +--- +"chainlink-deployments-framework": patch +--- + +Add WrongNonce string to skip during Nonce errors during mcms execution diff --git a/engine/cld/legacy/cli/mcmsv2/mcms_v2.go b/engine/cld/legacy/cli/mcmsv2/mcms_v2.go index cf17cae1..384cb060 100644 --- a/engine/cld/legacy/cli/mcmsv2/mcms_v2.go +++ b/engine/cld/legacy/cli/mcmsv2/mcms_v2.go @@ -18,8 +18,6 @@ import ( gethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" chainsel "github.com/smartcontractkit/chain-selectors" - "github.com/smartcontractkit/chainlink-testing-framework/framework/components/blockchain" - "github.com/smartcontractkit/chainlink-testing-framework/framework/rpc" "github.com/smartcontractkit/mcms" "github.com/smartcontractkit/mcms/sdk" "github.com/smartcontractkit/mcms/sdk/aptos" @@ -33,6 +31,9 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" + "github.com/smartcontractkit/chainlink-testing-framework/framework/components/blockchain" + "github.com/smartcontractkit/chainlink-testing-framework/framework/rpc" + "github.com/smartcontractkit/chainlink-deployments-framework/pkg/logger" suibindings "github.com/smartcontractkit/chainlink-sui/bindings" @@ -1294,8 +1295,8 @@ func isNonceError(rawErr error, selector uint64) (bool, error) { switch family { case chainsel.FamilyEVM: decodedErr := cldf.DecodeErr(bindings.ManyChainMultiSigABI, rawErr) - // Check if the error contains PostOpCountReached - if strings.Contains(decodedErr.Error(), "PostOpCountReached") { + // Check if the error contains PostOpCountReached / WrongNonce + if strings.Contains(decodedErr.Error(), "WrongNonce") || strings.Contains(decodedErr.Error(), "PostOpCountReached") { return true, nil }