From efc2ad7fe31cbbb82bc6a6b6c688141a72a73be2 Mon Sep 17 00:00:00 2001 From: simsonraj Date: Fri, 24 Oct 2025 14:39:19 +0530 Subject: [PATCH 1/3] Add WrongNonce error for EVM to skip --- engine/cld/legacy/cli/mcmsv2/mcms_v2.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/cld/legacy/cli/mcmsv2/mcms_v2.go b/engine/cld/legacy/cli/mcmsv2/mcms_v2.go index 41a5e014..3e4f6a47 100644 --- a/engine/cld/legacy/cli/mcmsv2/mcms_v2.go +++ b/engine/cld/legacy/cli/mcmsv2/mcms_v2.go @@ -1143,7 +1143,7 @@ func isNonceError(rawErr error, selector uint64) (bool, error) { case chainsel.FamilyEVM: decodedErr := cldf.DecodeErr(bindings.ManyChainMultiSigABI, rawErr) // Check if the error contains PostOpCountReached - if strings.Contains(decodedErr.Error(), "PostOpCountReached") { + if strings.Contains(decodedErr.Error(), "WrongNonce") || strings.Contains(decodedErr.Error(), "PostOpCountReached") { return true, nil } From c4a6f2604f3b4925f55f5b7e362c6c392a72447b Mon Sep 17 00:00:00 2001 From: simsonraj Date: Mon, 1 Dec 2025 19:30:24 +0800 Subject: [PATCH 2/3] updated comment --- engine/cld/legacy/cli/mcmsv2/mcms_v2.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/engine/cld/legacy/cli/mcmsv2/mcms_v2.go b/engine/cld/legacy/cli/mcmsv2/mcms_v2.go index 976760a7..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,7 +1295,7 @@ 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 + // Check if the error contains PostOpCountReached / WrongNonce if strings.Contains(decodedErr.Error(), "WrongNonce") || strings.Contains(decodedErr.Error(), "PostOpCountReached") { return true, nil } From 49e0facb2764e561bdd81b54957fc4f9b1a2d824 Mon Sep 17 00:00:00 2001 From: simsonraj Date: Mon, 1 Dec 2025 19:36:39 +0800 Subject: [PATCH 3/3] added changeset --- .changeset/perky-jars-flash.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/perky-jars-flash.md 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