Merge branch 'main' into sui-analyzer

Author: rodrigombsoares

.github/workflows/pull-request-main.yml

@@ -19,7 +19,7 @@ jobs:
         uses: smartcontractkit/.github/actions/ci-lint-go@ci-lint-go/v2 # [email protected]
         with:
           only-new-issues: "false"
-          golangci-lint-version: v2.1.6
+          golangci-lint-version: v2.5.0
 
   ci-lint-misc:
     name: Lint GH Actions and scripts

.github/workflows/schedule-main.yml

@@ -3,7 +3,7 @@ name: schedule-main
 on:
   schedule:
     # Runs once a day at 1:00 UTC on main branch to collect statistics
-    - cron: '0 1 * * *'
+    - cron: "0 1 * * *"
   workflow_dispatch:
 
 jobs:
@@ -19,7 +19,7 @@ jobs:
         uses: smartcontractkit/.github/actions/ci-lint-go@ci-lint-go/v2 # [email protected]
         with:
           only-new-issues: "false"
-          golangci-lint-version: v2.1.6
+          golangci-lint-version: v2.5.0
 
   ci-lint-misc:
     name: Lint GH Actions and scripts
@@ -52,7 +52,7 @@ jobs:
   sonarqube:
     name: Sonar Scan
     runs-on: ubuntu-24.04
-    needs: [ ci-test, ci-lint-misc,  ci-lint ]
+    needs: [ci-test, ci-lint-misc, ci-lint]
     permissions:
       contents: read
       actions: read

.golangci.yml

@@ -73,6 +73,10 @@ linters:
               desc: Use github.com/smartcontractkit/chainlink-common/pkg/logger instead
             - pkg: github.com/pkg/errors
               desc: Use the standard library instead, for example https://pkg.go.dev/fmt#Errorf
+            - pkg: github.com/smartcontractkit/chainlink/v2
+              desc: You must not import this package. There is no alternative.
+            - pkg: github.com/smartcontractkit/chainlink/deployment
+              desc: You must not import this package. There is no alternative.
     goconst:
       min-len: 5
     govet:

.tool-versions

@@ -1,7 +1,7 @@
 golang        1.24.4
-golangci-lint 2.1.6
+golangci-lint 2.5.0
 mockery       3.3.4
 nodejs        20.16.0
 pnpm          10.6.5
 task          3.41.0
-postgres      15.1
+postgres      15.1

CHANGELOG.md

@@ -1,5 +1,49 @@
 # chainlink-deployments-framework
 
+## 0.55.0
+
+### Minor Changes
+
+- [#492](https://github.com/smartcontractkit/chainlink-deployments-framework/pull/492) [`7243af8`](https://github.com/smartcontractkit/chainlink-deployments-framework/commit/7243af8be1d93101d0655c3424d60f6dcdcd883e) Thanks [@jkongie](https://github.com/jkongie)! - update aptos dep to v1.9.1
+
+- [#474](https://github.com/smartcontractkit/chainlink-deployments-framework/pull/474) [`fdcf28d`](https://github.com/smartcontractkit/chainlink-deployments-framework/commit/fdcf28d6dfaa06c3bdfd92acae2c5e414479c4af) Thanks [@ecPablo](https://github.com/ecPablo)! - add predecessors and opcount calculation logic to proposalutils package.
+
+### Patch Changes
+
+- [#496](https://github.com/smartcontractkit/chainlink-deployments-framework/pull/496) [`fea372c`](https://github.com/smartcontractkit/chainlink-deployments-framework/commit/fea372c81f6cd0a49c1793cd3f87686842669a1d) Thanks [@graham-chainlink](https://github.com/graham-chainlink)! - fix: update db controller to accept context
+
+- [#498](https://github.com/smartcontractkit/chainlink-deployments-framework/pull/498) [`ce51cbe`](https://github.com/smartcontractkit/chainlink-deployments-framework/commit/ce51cbefa3d92af9fa91bb5a6dcb531d69b76f54) Thanks [@gustavogama-cll](https://github.com/gustavogama-cll)! - fix: anvil env should check for addresses from DataStore as well
+
+- [#495](https://github.com/smartcontractkit/chainlink-deployments-framework/pull/495) [`126609e`](https://github.com/smartcontractkit/chainlink-deployments-framework/commit/126609e1400ac56142d751291ec9cab83d716216) Thanks [@ecPablo](https://github.com/ecPablo)! - get delay for advancing time from the proposal instead of constant value
+
+- [#497](https://github.com/smartcontractkit/chainlink-deployments-framework/pull/497) [`976d232`](https://github.com/smartcontractkit/chainlink-deployments-framework/commit/976d232b8ea5263f743f2885d50cbd18a5712b48) Thanks [@graham-chainlink](https://github.com/graham-chainlink)! - fix(catalog/memory): remove dependency on testing.T
+
+## 0.54.1
+
+### Patch Changes
+
+- [#489](https://github.com/smartcontractkit/chainlink-deployments-framework/pull/489) [`63fda69`](https://github.com/smartcontractkit/chainlink-deployments-framework/commit/63fda69d0c909cbb4cc6104a68cb03a92f4b12be) Thanks [@gustavogama-cll](https://github.com/gustavogama-cll)! - feat(mcms): query Timelock contract for CallProxy address
+
+- [#478](https://github.com/smartcontractkit/chainlink-deployments-framework/pull/478) [`f318c97`](https://github.com/smartcontractkit/chainlink-deployments-framework/commit/f318c973efa79278e12d2fa3c1b4eb52daa178bf) Thanks [@gustavogama-cll](https://github.com/gustavogama-cll)! - fix: restore owner after mcm.SetConfig() in fork tests with --test-signer
+
+## 0.54.0
+
+### Minor Changes
+
+- [#481](https://github.com/smartcontractkit/chainlink-deployments-framework/pull/481) [`1f7f6bc`](https://github.com/smartcontractkit/chainlink-deployments-framework/commit/1f7f6bc9be80a9522680022868448847b62ba20a) Thanks [@graham-chainlink](https://github.com/graham-chainlink)! - feat(operations): introduce AsUntypedRelaxed
+
+### Patch Changes
+
+- [#484](https://github.com/smartcontractkit/chainlink-deployments-framework/pull/484) [`fb9d9bf`](https://github.com/smartcontractkit/chainlink-deployments-framework/commit/fb9d9bfef7456052e4c07fc4bba3c9b16e5b4bd5) Thanks [@jkongie](https://github.com/jkongie)! - Fixes test engine MCMS execution when multiple proposals have the same `validUntil` timestamp.
+
+  A salt override is added to each timelock proposal persisted to the state to ensure unique operation
+  IDs in test environments where multiple proposals may have identical timestamps. This salt is used
+  in the hashing algorithm to determine the root of the merkle tree.
+
+- [#479](https://github.com/smartcontractkit/chainlink-deployments-framework/pull/479) [`930e469`](https://github.com/smartcontractkit/chainlink-deployments-framework/commit/930e469560608b9ec32a398393862b9fbc4d663a) Thanks [@jkongie](https://github.com/jkongie)! - Fixes MCMS Execution failing to Set Root in the test engine
+
+- [#475](https://github.com/smartcontractkit/chainlink-deployments-framework/pull/475) [`8d9ded3`](https://github.com/smartcontractkit/chainlink-deployments-framework/commit/8d9ded34541c2f47211832cfbbb7906b40c5746f) Thanks [@gustavogama-cll](https://github.com/gustavogama-cll)! - fix(mcms): check for PostOpCountReached errors in Solana as well
+
 ## 0.53.0
 
 ### Minor Changes

chain/internal/common/chain_metadata.go

@@ -1,4 +1,4 @@
-package common
+package common //nolint:revive // var-naming: This is an internal package for common code that is shared between chains.
 
 import (
 	"fmt"

chain/solana/solana_chain.go

@@ -64,7 +64,7 @@ func (c Chain) CloseBuffers(logger logger.Logger, buffer string) error {
 		"--bypass-warning",
 	}
 
-	cmd := exec.Command("solana", baseArgs...) // #nosec G204
+	cmd := exec.CommandContext(context.TODO(), "solana", baseArgs...) // #nosec G204
 	logger.Infof("Closing buffers with command: %s", cmd.String())
 
 	// Capture the command output
@@ -133,12 +133,12 @@ func (c Chain) DeployProgram(logger logger.Logger, programInfo ProgramInfo, isUp
 		if overallocate && programBytes > 0 {
 			baseArgs = append(baseArgs, "--max-len", strconv.Itoa(programBytes))
 		}
-		cmd = exec.Command("solana", baseArgs...) // #nosec G204
+		cmd = exec.CommandContext(context.TODO(), "solana", baseArgs...) // #nosec G204
 	} else {
 		// Keypairs wont be created for devenvs
 		logger.Infow("Deploying new program",
 			"programFile", programFile)
-		cmd = exec.Command("solana", baseArgs...) // #nosec G204
+		cmd = exec.CommandContext(context.TODO(), "solana", baseArgs...) // #nosec G204
 	}
 
 	// Capture the command output

chain/utils/chain_info.go

@@ -1,4 +1,4 @@
-package utils
+package utils //nolint:revive // var-naming: We need to keep this name for now for backwards compatibility.
 
 import chainsel "github.com/smartcontractkit/chain-selectors"
 

datastore/catalog/memory/address_ref_store.go

@@ -5,7 +5,6 @@ import (
 	"database/sql"
 	"errors"
 	"fmt"
-	"testing"
 
 	"github.com/lib/pq"
 
@@ -39,25 +38,21 @@ const (
 )
 
 type memoryAddressRefStore struct {
-	t      *testing.T
 	config MemoryDataStoreConfig
 	db     *dbController
 }
 
 // Ensure memoryAddressRefStore implements the V2 interface
 var _ datastore.MutableRefStoreV2[datastore.AddressRefKey, datastore.AddressRef] = &memoryAddressRefStore{}
 
-func newCatalogAddressRefStore(t *testing.T, config MemoryDataStoreConfig, db *dbController) *memoryAddressRefStore {
-	t.Helper()
-
+func newCatalogAddressRefStore(config MemoryDataStoreConfig, db *dbController) *memoryAddressRefStore {
 	return &memoryAddressRefStore{
-		t:      t,
 		config: config,
 		db:     db,
 	}
 }
 
-func (s *memoryAddressRefStore) Get(_ context.Context, key datastore.AddressRefKey, options ...datastore.GetOption) (datastore.AddressRef, error) {
+func (s *memoryAddressRefStore) Get(ctx context.Context, key datastore.AddressRefKey, options ...datastore.GetOption) (datastore.AddressRef, error) {
 	ignoreTransactions := false
 	for _, option := range options {
 		switch option {
@@ -71,7 +66,7 @@ func (s *memoryAddressRefStore) Get(_ context.Context, key datastore.AddressRefK
 	} else {
 		db = s.db
 	}
-	rows, err := db.Query(query_ADDRESS_REFERENCE_BY_ID, key.ChainSelector(), key.Type().String(), key.Version().String(), key.Qualifier())
+	rows, err := db.QueryContext(ctx, query_ADDRESS_REFERENCE_BY_ID, key.ChainSelector(), key.Type().String(), key.Version().String(), key.Qualifier())
 	defer func(rows *sql.Rows) {
 		if rows != nil {
 			_ = rows.Close()
@@ -107,8 +102,8 @@ func (s *memoryAddressRefStore) Get(_ context.Context, key datastore.AddressRefK
 }
 
 // Fetch returns a copy of all AddressRefs in the catalog.
-func (s *memoryAddressRefStore) Fetch(_ context.Context) ([]datastore.AddressRef, error) {
-	rows, err := s.db.Query(query_ALL_ADDRESS_REFERENCES)
+func (s *memoryAddressRefStore) Fetch(ctx context.Context) ([]datastore.AddressRef, error) {
+	rows, err := s.db.QueryContext(ctx, query_ALL_ADDRESS_REFERENCES)
 	defer func(rows *sql.Rows) {
 		if rows != nil {
 			_ = rows.Close()
@@ -171,8 +166,9 @@ func (s *memoryAddressRefStore) Update(ctx context.Context, r datastore.AddressR
 	return s.edit(ctx, query_UPDATE_ADDRESS_REFERENCE, r)
 }
 
-func (s *memoryAddressRefStore) edit(_ context.Context, qry string, r datastore.AddressRef) error {
-	result, err := s.db.Exec(
+func (s *memoryAddressRefStore) edit(ctx context.Context, qry string, r datastore.AddressRef) error {
+	result, err := s.db.ExecContext(
+		ctx,
 		qry,
 		r.ChainSelector,
 		r.Type.String(),

datastore/catalog/memory/address_ref_store_test.go

@@ -450,10 +450,11 @@ func setupTestStore(t *testing.T) (*memoryAddressRefStore, func()) {
 		Domain:      "test_domain",
 		Environment: "catalog_testing",
 	}
-	store := NewMemoryDataStore(t, config)
+	store, err := NewMemoryDataStore(config)
+	require.NoError(t, err)
 
 	return store.Addresses().(*memoryAddressRefStore), func() {
-		store.Close()
+		require.NoError(t, store.Close())
 	}
 }