Merge remote-tracking branch 'origin/main' into canton

Author: friedemannf

.changeset/afraid-parks-rush.md

@@ -1,5 +1,28 @@
 # chainlink-deployments-framework
 
+## 0.75.0
+
+### Minor Changes
+
+- [#670](https://github.com/smartcontractkit/chainlink-deployments-framework/pull/670) [`0a320ef`](https://github.com/smartcontractkit/chainlink-deployments-framework/commit/0a320efc8afe4d52f6569b46ac81aa95ba7a14e4) Thanks [@graham-chainlink](https://github.com/graham-chainlink)! - feat(engine): allow configuration for SUI chain in test engine
+
+### Patch Changes
+
+- [#668](https://github.com/smartcontractkit/chainlink-deployments-framework/pull/668) [`ff9c85a`](https://github.com/smartcontractkit/chainlink-deployments-framework/commit/ff9c85a1c09ec9ba78e3073758e64502381e7a58) Thanks [@jkongie](https://github.com/jkongie)! - Bump `go-ethereum` to v1.16.8
+
+## 0.74.3
+
+### Patch Changes
+
+- [#660](https://github.com/smartcontractkit/chainlink-deployments-framework/pull/660) [`a8928d5`](https://github.com/smartcontractkit/chainlink-deployments-framework/commit/a8928d583390d89d496eb20269ca949bb55a59db) Thanks [@ecPablo](https://github.com/ecPablo)! - fix: avoid loading proposal ctx if the provider is nil
+  chore: add deprecation warning to mcmsv2 commands
+
+- [#666](https://github.com/smartcontractkit/chainlink-deployments-framework/pull/666) [`d5bcb7c`](https://github.com/smartcontractkit/chainlink-deployments-framework/commit/d5bcb7cdf936230ddfa5f1cbff7774b3e4864ea5) Thanks [@graham-chainlink](https://github.com/graham-chainlink)! - fix(jd): remove wsrpc from error message
+
+- [#655](https://github.com/smartcontractkit/chainlink-deployments-framework/pull/655) [`3791c84`](https://github.com/smartcontractkit/chainlink-deployments-framework/commit/3791c84cfd90e75e3b60261750e982ea5ac1a22d) Thanks [@gustavogama-cll](https://github.com/gustavogama-cll)! - feat: log from, to and raw data in forktests
+
+- [#658](https://github.com/smartcontractkit/chainlink-deployments-framework/pull/658) [`504cfaa`](https://github.com/smartcontractkit/chainlink-deployments-framework/commit/504cfaa183399c6d86ee4b36d71239518322c8f3) Thanks [@ecPablo](https://github.com/ecPablo)! - fix proposal analyzer render issues with array details
+
 ## 0.74.2
 
 ### Patch Changes

.changeset/public-mugs-agree.md

@@ -105,7 +105,7 @@ func Load(
 		)
 		if err != nil {
 			if errors.Is(err, offchain.ErrEndpointsRequired) {
-				lggr.Warn("Skipping JD initialization: gRPC and wsRPC endpoints are not set in config")
+				lggr.Warn("Skipping JD initialization: gRPC endpoint is not set in config")
 			} else {
 				return fdeployment.Environment{},
 					fmt.Errorf("failed to load offchain client for environment %s: %w", envKey, err)

.changeset/purple-trams-sort.md

@@ -122,7 +122,7 @@ func LoadFork(
 		)
 		if err != nil {
 			if errors.Is(err, offchain.ErrEndpointsRequired) {
-				lggr.Warn("Skipping JD initialization: gRPC and wsRPC endpoints are not set in config")
+				lggr.Warn("Skipping JD initialization: gRPC endpoint is not set in config")
 			} else {
 				return ForkedEnvironment{}, fmt.Errorf("failed to load offchain client: %w", err)
 			}

CHANGELOG.md

@@ -833,6 +833,9 @@ func buildMCMSv2AnalyzeProposalCmd(
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			// Create config
+			if proposalCtxProvider == nil {
+				return errors.New("proposalCtxProvider is required, please provide one in the domain cli constructor")
+			}
 			cfgv2, err := newCfgv2(lggr, cmd, domain, proposalCtxProvider, acceptExpiredProposal)
 			if err != nil {
 				return fmt.Errorf("error creating config: %w", err)
@@ -1175,6 +1178,9 @@ func newCfgv2(lggr logger.Logger, cmd *cobra.Command, domain cldf_domain.Domain,
 		if err != nil {
 			return nil, fmt.Errorf("failed to provide proposal analysis context: %w", err)
 		}
+		if cfg.proposalCtx == nil {
+			return nil, errors.New("proposal analysis context provider returned nil context. Make sure the ProposalContextProvider is correctly initialized in your domain CLI on BuildMCMSv2Cmd()")
+		}
 	}
 
 	if flags.fork {
@@ -1518,7 +1524,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, metadata.DeployerStateObj)
+		entrypointEncoder := suibindings.NewCCIPEntrypointArgEncoder(metadata.RegistryObj, 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)

engine/cld/environment/environment.go

@@ -17,6 +17,7 @@ var (
 	newAptosContainerLoader         = onchain.NewAptosContainerLoader
 	newSolanaContainerLoader        = onchain.NewSolanaContainerLoader
 	newSuiContainerLoader           = onchain.NewSuiContainerLoader
+	newSuiContainerLoaderWithConfig = onchain.NewSuiContainerLoaderWithConfig
 	newTonContainerLoader           = onchain.NewTonContainerLoader
 	newTonContainerLoaderWithConfig = onchain.NewTonContainerLoaderWithConfig
 	newTronContainerLoader          = onchain.NewTronContainerLoader
@@ -170,13 +171,28 @@ func WithSuiContainer(t *testing.T, selectors []uint64) LoadOpt {
 	return withChainLoader(t, newSuiContainerLoader(), selectors)
 }
 
+// WithSuiContainerWithConfig loads Sui blockchain container instances with custom configuration
+// for specified chain selectors.
+func WithSuiContainerWithConfig(t *testing.T, selectors []uint64, cfg onchain.SuiContainerConfig) LoadOpt {
+	t.Helper()
+
+	return withChainLoader(t, newSuiContainerLoaderWithConfig(cfg), selectors)
+}
+
 // WithSuiContainerN loads n Sui blockchain container instances.
 func WithSuiContainerN(t *testing.T, n int) LoadOpt {
 	t.Helper()
 
 	return withChainLoaderN(t, newSuiContainerLoader(), n)
 }
 
+// WithSuiContainerNWithConfig loads n Sui blockchain container instances with custom configuration.
+func WithSuiContainerNWithConfig(t *testing.T, n int, cfg onchain.SuiContainerConfig) LoadOpt {
+	t.Helper()
+
+	return withChainLoaderN(t, newSuiContainerLoaderWithConfig(cfg), n)
+}
+
 // WithLogger sets the logger for the environment.
 func WithLogger(lggr logger.Logger) LoadOpt {
 	return func(cmps *components) error {

engine/cld/environment/fork.go

@@ -14,6 +14,9 @@ import (
 	suiprov "github.com/smartcontractkit/chainlink-deployments-framework/chain/sui/provider"
 )
 
+// SuiContainerConfig is the configuration for the Sui container loader.
+type SuiContainerConfig = suiprov.CTFChainProviderConfig
+
 // NewSuiContainerLoader creates a new Sui chain loader with default configuration using CTF.
 func NewSuiContainerLoader() *ChainLoader {
 	// Generate a random Sui Ed25519 private key for testing
@@ -34,6 +37,18 @@ func NewSuiContainerLoader() *ChainLoader {
 	}
 }
 
+// NewSuiContainerLoaderWithConfig creates a new Sui chain loader with the given configuration using CTF.
+func NewSuiContainerLoaderWithConfig(cfg SuiContainerConfig) *ChainLoader {
+	return &ChainLoader{
+		selectors: getTestSelectorsByFamily(chainselectors.FamilySui),
+		factory: func(t *testing.T, selector uint64) (fchain.BlockChain, error) {
+			t.Helper()
+
+			return suiprov.NewCTFChainProvider(t, selector, cfg).Initialize(t.Context())
+		},
+	}
+}
+
 // randomSeed generates a random seed for the Sui Ed25519 private key.
 func suiRandomSeed() []byte {
 	seed := make([]byte, ed25519.SeedSize)

engine/cld/legacy/cli/mcmsv2/mcms_v2.go

@@ -1,11 +1,17 @@
 package onchain
 
 import (
+	"crypto/ed25519"
+	"crypto/rand"
+	"encoding/hex"
+	"sync"
 	"testing"
 
 	chainselectors "github.com/smartcontractkit/chain-selectors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	suiprov "github.com/smartcontractkit/chainlink-deployments-framework/chain/sui/provider"
 )
 
 func Test_NewSuiContainerLoader(t *testing.T) {
@@ -23,3 +29,34 @@ func Test_NewSuiContainerLoader(t *testing.T) {
 	// but we can verify it exists.
 	require.NotNil(t, loader.factory)
 }
+
+func Test_NewSuiContainerLoaderWithConfig(t *testing.T) {
+	t.Parallel()
+
+	// Generate a test private key
+	seed := make([]byte, ed25519.SeedSize)
+	_, err := rand.Read(seed)
+	require.NoError(t, err)
+
+	seeded := ed25519.NewKeyFromSeed(seed)
+	seedBytes := seeded[:32]
+	testPrivateKey := hex.EncodeToString(seedBytes)
+
+	var once sync.Once
+
+	config := suiprov.CTFChainProviderConfig{
+		Once:              &once,
+		DeployerSignerGen: suiprov.AccountGenPrivateKey(testPrivateKey),
+	}
+
+	loader := NewSuiContainerLoaderWithConfig(config)
+	require.NotNil(t, loader)
+
+	// Should have the same selectors as getTestSelectorsByFamily returns
+	require.NotNil(t, loader.selectors)
+	wantSelectors := getTestSelectorsByFamily(chainselectors.FamilySui)
+	assert.Equal(t, wantSelectors, loader.selectors)
+
+	// Factory should be configured with the provided config
+	require.NotNil(t, loader.factory)
+}