From 8d8849a02986f4e3d2563f3f436c3d5ae39c8b0e Mon Sep 17 00:00:00 2001 From: JohnChangUK Date: Wed, 5 Nov 2025 09:50:40 -0500 Subject: [PATCH 1/4] Update Sui MCMS bindings --- engine/cld/legacy/cli/mcmsv2/mcms_v2.go | 9 +++++---- go.mod | 4 ++-- go.sum | 8 ++++---- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/engine/cld/legacy/cli/mcmsv2/mcms_v2.go b/engine/cld/legacy/cli/mcmsv2/mcms_v2.go index 06856b896..069fed674 100644 --- a/engine/cld/legacy/cli/mcmsv2/mcms_v2.go +++ b/engine/cld/legacy/cli/mcmsv2/mcms_v2.go @@ -17,8 +17,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" @@ -32,6 +30,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" @@ -1416,7 +1417,7 @@ func getExecutorWithChainOverride(cfg *cfgv2, chainSelector types.ChainSelector) return nil, fmt.Errorf("error getting sui metadata from proposal: %w", err) } chain := cfg.blockchains.SuiChains()[uint64(chainSelector)] - entrypointEncoder := suibindings.NewCCIPEntrypointArgEncoder(metadata.RegistryObj, "") // FIXME: metadata current does not have deployer account obj https://smartcontract-it.atlassian.net/browse/NONEVM-2954 + entrypointEncoder := suibindings.NewCCIPEntrypointArgEncoder(metadata.RegistryObj, metadata.DeployerStateObj) return sui.NewExecutor(chain.Client, chain.Signer, encoder, entrypointEncoder, metadata.McmsPackageID, metadata.Role, cfg.timelockProposal.ChainMetadata[chainSelector].MCMAddress, metadata.AccountObj, metadata.RegistryObj, metadata.TimelockObj) default: @@ -1463,7 +1464,7 @@ func getTimelockExecutorWithChainOverride(cfg *cfgv2, chainSelector types.ChainS if err != nil { return nil, fmt.Errorf("error getting sui metadata from proposal: %w", err) } - entrypointEncoder := suibindings.NewCCIPEntrypointArgEncoder(metadata.AccountObj, "") // FIXME: metadata current does not have deployer state obj https://smartcontract-it.atlassian.net/browse/NONEVM-2954 + entrypointEncoder := suibindings.NewCCIPEntrypointArgEncoder(metadata.AccountObj, metadata.DeployerStateObj) executor, err = sui.NewTimelockExecutor(chain.Client, chain.Signer, entrypointEncoder, metadata.McmsPackageID, metadata.RegistryObj, metadata.AccountObj) if err != nil { return nil, fmt.Errorf("error creating sui timelock executor: %w", err) diff --git a/go.mod b/go.mod index 309956abc..8b00d202b 100644 --- a/go.mod +++ b/go.mod @@ -38,7 +38,7 @@ require ( github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20250815105909-75499abc4335 github.com/smartcontractkit/freeport v0.1.3-0.20250716200817-cb5dfd0e369e github.com/smartcontractkit/libocr v0.0.0-20250707144819-babe0ec4e358 - github.com/smartcontractkit/mcms v0.30.1 + github.com/smartcontractkit/mcms v0.30.2-0.20251105142805-988f5319936f github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.10 github.com/spf13/viper v1.21.0 @@ -239,7 +239,7 @@ require ( github.com/shopspring/decimal v1.4.0 // indirect github.com/sigurn/crc16 v0.0.0-20211026045750-20ab5afb07e3 // indirect github.com/sirupsen/logrus v1.9.3 // indirect - github.com/smartcontractkit/chainlink-sui v0.0.0-20251103204108-d181d6769bab + github.com/smartcontractkit/chainlink-sui v0.0.0-20251104205009-00bd79b81471 github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 // indirect github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect github.com/spf13/afero v1.15.0 // indirect diff --git a/go.sum b/go.sum index 32393fe40..844b43c6b 100644 --- a/go.sum +++ b/go.sum @@ -701,8 +701,8 @@ github.com/smartcontractkit/chainlink-protos/job-distributor v0.17.0 h1:xHPmFDhf github.com/smartcontractkit/chainlink-protos/job-distributor v0.17.0/go.mod h1:/dVVLXrsp+V0AbcYGJo3XMzKg3CkELsweA/TTopCsKE= github.com/smartcontractkit/chainlink-protos/op-catalog v0.0.4 h1:AEnxv4HM3WD1RbQkRiFyb9cJ6YKAcqBp1CpIcFdZfuo= github.com/smartcontractkit/chainlink-protos/op-catalog v0.0.4/go.mod h1:PjZD54vr6rIKEKQj6HNA4hllvYI/QpT+Zefj3tqkFAs= -github.com/smartcontractkit/chainlink-sui v0.0.0-20251103204108-d181d6769bab h1:X1VWFEaoLSCCaxFR3BWbo09UMEpHANtylesISbIDgsw= -github.com/smartcontractkit/chainlink-sui v0.0.0-20251103204108-d181d6769bab/go.mod h1:VlyZhVw+a93Sk8rVHOIH6tpiXrMzuWLZrjs1eTIExW8= +github.com/smartcontractkit/chainlink-sui v0.0.0-20251104205009-00bd79b81471 h1:EaLuGs7jZ6Vm2iv6rNK3bQ3XN5CRbFd4knjjvaD1zFc= +github.com/smartcontractkit/chainlink-sui v0.0.0-20251104205009-00bd79b81471/go.mod h1:VlyZhVw+a93Sk8rVHOIH6tpiXrMzuWLZrjs1eTIExW8= github.com/smartcontractkit/chainlink-testing-framework/framework v0.11.7 h1:jVlRG9GTpDGYtP0iabxHZW4s3pXdpN4/lTgZEdE64P4= github.com/smartcontractkit/chainlink-testing-framework/framework v0.11.7/go.mod h1:BTUmWJGbOQtMdDW8cy4fu0wLoj8tKFQiLR7SE+OyTXU= github.com/smartcontractkit/chainlink-testing-framework/seth v1.51.2 h1:ZJ/8Jx6Be5//TyjPi1pS1uotnmcYq5vVkSyISIymSj8= @@ -717,8 +717,8 @@ github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 h1:12i github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7/go.mod h1:FX7/bVdoep147QQhsOPkYsPEXhGZjeYx6lBSaSXtZOA= github.com/smartcontractkit/libocr v0.0.0-20250707144819-babe0ec4e358 h1:+NVzR5LZVazRUunzVn34u+lwnpmn6NTVPCeZOVyQHLo= github.com/smartcontractkit/libocr v0.0.0-20250707144819-babe0ec4e358/go.mod h1:Acy3BTBxou83ooMESLO90s8PKSu7RvLCzwSTbxxfOK0= -github.com/smartcontractkit/mcms v0.30.1 h1:AtsbK/gAbSp2fwDNiUCncV+LjgyM19cilPquFKGwTYg= -github.com/smartcontractkit/mcms v0.30.1/go.mod h1:ow51e6OZg2mUgShaoNHUYVpChvNejUR4H8crV79ZBGk= +github.com/smartcontractkit/mcms v0.30.2-0.20251105142805-988f5319936f h1:AmW1dZqduXY3xLd4VLzvNtJ06vnbi22vE7AGdsZ2Wo8= +github.com/smartcontractkit/mcms v0.30.2-0.20251105142805-988f5319936f/go.mod h1:x3mNRGl1K+iFc/v/g7jw42IUQZl6zyE8OliTY+h+cPg= github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 h1:+jumHNA0Wrelhe64i8F6HNlS8pkoyMv5sreGx2Ry5Rw= github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8/go.mod h1:3n1Cwaq1E1/1lhQhtRK2ts/ZwZEhjcQeJQ1RuC6Q/8U= github.com/spf13/afero v1.15.0 h1:b/YBCLWAJdFWJTN9cLhiXXcD7mzKn9Dm86dNnfyQw1I= From a7a90a44d8a19d96557fd3543a4bf2886f6bc72a Mon Sep 17 00:00:00 2001 From: JohnChangUK Date: Wed, 5 Nov 2025 22:54:07 -0500 Subject: [PATCH 2/4] Update MCMS to v0.30.2 --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 8b00d202b..2db1f3b69 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,7 @@ require ( github.com/pelletier/go-toml/v2 v2.2.4 github.com/segmentio/ksuid v1.0.4 github.com/smartcontractkit/ccip-owner-contracts v0.1.0 - github.com/smartcontractkit/chain-selectors v1.0.77 + github.com/smartcontractkit/chain-selectors v1.0.78 github.com/smartcontractkit/chainlink-aptos v0.0.0-20251024142440-51f2ad2652a2 github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20250903115155-a68d8c28ae1d github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250805210128-7f8a0f403c3a @@ -38,7 +38,7 @@ require ( github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20250815105909-75499abc4335 github.com/smartcontractkit/freeport v0.1.3-0.20250716200817-cb5dfd0e369e github.com/smartcontractkit/libocr v0.0.0-20250707144819-babe0ec4e358 - github.com/smartcontractkit/mcms v0.30.2-0.20251105142805-988f5319936f + github.com/smartcontractkit/mcms v0.30.2 github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.10 github.com/spf13/viper v1.21.0 diff --git a/go.sum b/go.sum index 844b43c6b..51dce6f19 100644 --- a/go.sum +++ b/go.sum @@ -681,8 +681,8 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/smartcontractkit/ccip-owner-contracts v0.1.0 h1:GiBDtlx7539o7AKlDV+9LsA7vTMPv+0n7ClhSFnZFAk= github.com/smartcontractkit/ccip-owner-contracts v0.1.0/go.mod h1:NnT6w4Kj42OFFXhSx99LvJZWPpMjmo4+CpDEWfw61xY= -github.com/smartcontractkit/chain-selectors v1.0.77 h1:/Mk9IiOyf07bYJ3+xbIH5vYys1HDt8+3+ESqW63nDP0= -github.com/smartcontractkit/chain-selectors v1.0.77/go.mod h1:xsKM0aN3YGcQKTPRPDDtPx2l4mlTN1Djmg0VVXV40b8= +github.com/smartcontractkit/chain-selectors v1.0.78 h1:TCnekPLzCux1lKsrygX8+n1iMO1N330GrykbCYiR0FM= +github.com/smartcontractkit/chain-selectors v1.0.78/go.mod h1:xsKM0aN3YGcQKTPRPDDtPx2l4mlTN1Djmg0VVXV40b8= github.com/smartcontractkit/chainlink-aptos v0.0.0-20251024142440-51f2ad2652a2 h1:vGdeMwHO3ow88HvxfhA4DDPYNY0X9jmdux7L83UF/W8= github.com/smartcontractkit/chainlink-aptos v0.0.0-20251024142440-51f2ad2652a2/go.mod h1:iteU0WORHkArACVh/HoY/1bipV4TcNcJdTmom9uIT0E= github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20250903115155-a68d8c28ae1d h1:4tEhMQnJW5jndVxukgC+/CVf+FkHVKg3AYygkMtOVUQ= @@ -717,8 +717,8 @@ github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 h1:12i github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7/go.mod h1:FX7/bVdoep147QQhsOPkYsPEXhGZjeYx6lBSaSXtZOA= github.com/smartcontractkit/libocr v0.0.0-20250707144819-babe0ec4e358 h1:+NVzR5LZVazRUunzVn34u+lwnpmn6NTVPCeZOVyQHLo= github.com/smartcontractkit/libocr v0.0.0-20250707144819-babe0ec4e358/go.mod h1:Acy3BTBxou83ooMESLO90s8PKSu7RvLCzwSTbxxfOK0= -github.com/smartcontractkit/mcms v0.30.2-0.20251105142805-988f5319936f h1:AmW1dZqduXY3xLd4VLzvNtJ06vnbi22vE7AGdsZ2Wo8= -github.com/smartcontractkit/mcms v0.30.2-0.20251105142805-988f5319936f/go.mod h1:x3mNRGl1K+iFc/v/g7jw42IUQZl6zyE8OliTY+h+cPg= +github.com/smartcontractkit/mcms v0.30.2 h1:xdvZZ5V4q6J/zzb2QV5wjWaZtGj+xvyHy8UVhsOMA8I= +github.com/smartcontractkit/mcms v0.30.2/go.mod h1:7GXnTUilJcUdzndp7HXDwjinjubG2Jsu2A1oRbtaKBs= github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 h1:+jumHNA0Wrelhe64i8F6HNlS8pkoyMv5sreGx2Ry5Rw= github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8/go.mod h1:3n1Cwaq1E1/1lhQhtRK2ts/ZwZEhjcQeJQ1RuC6Q/8U= github.com/spf13/afero v1.15.0 h1:b/YBCLWAJdFWJTN9cLhiXXcD7mzKn9Dm86dNnfyQw1I= From 71f54028f5df0e30b9e3100155b3abe74e973dca Mon Sep 17 00:00:00 2001 From: JohnChangUK Date: Wed, 5 Nov 2025 23:05:42 -0500 Subject: [PATCH 3/4] Reformat import --- engine/cld/legacy/cli/mcmsv2/mcms_v2.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/engine/cld/legacy/cli/mcmsv2/mcms_v2.go b/engine/cld/legacy/cli/mcmsv2/mcms_v2.go index 72d12f7fb..f98cbd2d5 100644 --- a/engine/cld/legacy/cli/mcmsv2/mcms_v2.go +++ b/engine/cld/legacy/cli/mcmsv2/mcms_v2.go @@ -17,6 +17,8 @@ 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" @@ -30,9 +32,6 @@ 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" From ea32e93765cc22d7b1bd179d55127fd7bf6991b1 Mon Sep 17 00:00:00 2001 From: JohnChangUK Date: Thu, 6 Nov 2025 09:39:56 -0500 Subject: [PATCH 4/4] Add changelog --- .changeset/quiet-sites-happen.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/quiet-sites-happen.md diff --git a/.changeset/quiet-sites-happen.md b/.changeset/quiet-sites-happen.md new file mode 100644 index 000000000..6c49852f3 --- /dev/null +++ b/.changeset/quiet-sites-happen.md @@ -0,0 +1,5 @@ +--- +"chainlink-deployments-framework": minor +--- + +Sui MCMS upgrade