Merge branch 'develop' into feature/BCI-2996-local-finality-violation

# Conflicts: # common/client/mocks/config.go # common/client/multi_node.go # common/client/node.go # core/chains/evm/client/config_builder.go
smartcontractkit · Jun 10, 2024 · 0108734 · 0108734
2 parents 003efd0 + 3151a1f
commit 0108734
Show file tree

Hide file tree

Showing 148 changed files with 3,617 additions and 1,682 deletions.
diff --git a/.changeset/chilly-ladybugs-visit.md b/.changeset/chilly-ladybugs-visit.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Cleanup txm tests #internal
diff --git a/.changeset/cool-turtles-think.md b/.changeset/cool-turtles-think.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal return hashed capability ids
diff --git a/.changeset/four-knives-stare.md b/.changeset/four-knives-stare.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal [Keystone] Merge version field with ID
diff --git a/.changeset/happy-oranges-heal.md b/.changeset/happy-oranges-heal.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal Add workflow validation
diff --git a/.changeset/healthy-shoes-lie.md b/.changeset/healthy-shoes-lie.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal [Keystone] Add remote target to syncer
diff --git a/.changeset/moody-dogs-begin.md b/.changeset/moody-dogs-begin.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal update error message when node does not exist
diff --git a/.changeset/olive-experts-matter.md b/.changeset/olive-experts-matter.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#db_update Add account_address_public_key to feeds_manager_chain_configs
diff --git a/.changeset/popular-cycles-divide.md b/.changeset/popular-cycles-divide.md
@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#bugfix use correct internal id in workflow auto-approval
diff --git a/.changeset/rotten-hats-search.md b/.changeset/rotten-hats-search.md
@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Move chaintype #internal
diff --git a/.changeset/shy-deers-hope.md b/.changeset/shy-deers-hope.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal
diff --git a/common/client/mocks/config.go b/common/client/mocks/config.go
@@ -1,23 +1,14 @@
 package mocks
 
-import (
-	"time"
-
-	commonconfig "github.com/smartcontractkit/chainlink/v2/common/config"
-)
+import "time"
 
 type ChainConfig struct {
 	IsFinalityTagEnabled    bool
 	FinalityDepthVal        uint32
 	NoNewHeadsThresholdVal  time.Duration
-	ChainTypeVal            commonconfig.ChainType
 	FinalizedBlockOffsetVal uint32
 }
 
-func (t ChainConfig) ChainType() commonconfig.ChainType {
-	return t.ChainTypeVal
-}
-
 func (t ChainConfig) NodeNoNewHeadsThreshold() time.Duration {
 	return t.NoNewHeadsThresholdVal
 }

diff --git a/common/client/multi_node.go b/common/client/multi_node.go
@@ -17,7 +17,6 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 	"github.com/smartcontractkit/chainlink-common/pkg/utils"
 
-	"github.com/smartcontractkit/chainlink/v2/common/config"
 	feetypes "github.com/smartcontractkit/chainlink/v2/common/fee/types"
 	"github.com/smartcontractkit/chainlink/v2/common/types"
 )
@@ -73,7 +72,6 @@ type MultiNode[
 
 	BatchCallContextAll(ctx context.Context, b []BATCH_ELEM) error
 	ConfiguredChainID() CHAIN_ID
-	IsL2() bool
 }
 
 type multiNode[
@@ -95,7 +93,6 @@ type multiNode[
 	nodes                 []Node[CHAIN_ID, HEAD, RPC_CLIENT]
 	sendonlys             []SendOnlyNode[CHAIN_ID, RPC_CLIENT]
 	chainID               CHAIN_ID
-	chainType             config.ChainType
 	lggr                  logger.SugaredLogger
 	selectionMode         string
 	noNewHeadsThreshold   time.Duration
@@ -138,7 +135,6 @@ func NewMultiNode[
 	nodes []Node[CHAIN_ID, HEAD, RPC_CLIENT],
 	sendonlys []SendOnlyNode[CHAIN_ID, RPC_CLIENT],
 	chainID CHAIN_ID,
-	chainType config.ChainType,
 	chainFamily string,
 	classifySendTxError func(tx TX, err error) SendTxReturnCode,
 	sendTxSoftTimeout time.Duration,
@@ -154,7 +150,6 @@ func NewMultiNode[
 		nodes:                 nodes,
 		sendonlys:             sendonlys,
 		chainID:               chainID,
-		chainType:             chainType,
 		lggr:                  logger.Sugared(lggr).Named("MultiNode").With("chainID", chainID.String()),
 		selectionMode:         selectionMode,
 		noNewHeadsThreshold:   noNewHeadsThreshold,
@@ -524,10 +519,6 @@ func (c *multiNode[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OP
 	return n.RPC().ChainID(ctx)
 }
 
-func (c *multiNode[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD, RPC_CLIENT, BATCH_ELEM]) ChainType() config.ChainType {
-	return c.chainType
-}
-
 func (c *multiNode[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD, RPC_CLIENT, BATCH_ELEM]) CodeAt(ctx context.Context, account ADDR, blockNumber *big.Int) (code []byte, err error) {
 	n, err := c.selectNode()
 	if err != nil {
@@ -556,10 +547,6 @@ func (c *multiNode[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OP
 	return n.RPC().FilterEvents(ctx, query)
 }
 
-func (c *multiNode[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD, RPC_CLIENT, BATCH_ELEM]) IsL2() bool {
-	return c.ChainType().IsL2()
-}
-
 func (c *multiNode[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD, RPC_CLIENT, BATCH_ELEM]) LatestBlockHeight(ctx context.Context) (h *big.Int, err error) {
 	n, err := c.selectNode()
 	if err != nil {

diff --git a/common/client/multi_node_test.go b/common/client/multi_node_test.go
@@ -17,7 +17,6 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/utils/tests"
 
-	"github.com/smartcontractkit/chainlink/v2/common/config"
 	"github.com/smartcontractkit/chainlink/v2/common/types"
 )
 
@@ -37,7 +36,6 @@ type multiNodeOpts struct {
 	nodes               []Node[types.ID, types.Head[Hashable], multiNodeRPCClient]
 	sendonlys           []SendOnlyNode[types.ID, multiNodeRPCClient]
 	chainID             types.ID
-	chainType           config.ChainType
 	chainFamily         string
 	classifySendTxError func(tx any, err error) SendTxReturnCode
 	sendTxSoftTimeout   time.Duration
@@ -51,7 +49,7 @@ func newTestMultiNode(t *testing.T, opts multiNodeOpts) testMultiNode {
 	result := NewMultiNode[types.ID, *big.Int, Hashable, Hashable, any, Hashable, any, any,
 		types.Receipt[Hashable, Hashable], Hashable, types.Head[Hashable], multiNodeRPCClient, any](opts.logger,
 		opts.selectionMode, opts.leaseDuration, opts.noNewHeadsThreshold, opts.nodes, opts.sendonlys,
-		opts.chainID, opts.chainType, opts.chainFamily, opts.classifySendTxError, opts.sendTxSoftTimeout)
+		opts.chainID, opts.chainFamily, opts.classifySendTxError, opts.sendTxSoftTimeout)
 	return testMultiNode{
 		result.(*multiNode[types.ID, *big.Int, Hashable, Hashable, any, Hashable, any, any,
 			types.Receipt[Hashable, Hashable], Hashable, types.Head[Hashable], multiNodeRPCClient, any]),

diff --git a/common/client/node.go b/common/client/node.go
@@ -14,7 +14,6 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 
-	commonconfig "github.com/smartcontractkit/chainlink/v2/common/config"
 	"github.com/smartcontractkit/chainlink/v2/common/types"
 )
 
@@ -51,7 +50,6 @@ type ChainConfig interface {
 	NodeNoNewHeadsThreshold() time.Duration
 	FinalityDepth() uint32
 	FinalityTagEnabled() bool
-	ChainType() commonconfig.ChainType
 	FinalizedBlockOffset() uint32
 }
 

diff --git a/contracts/.changeset/long-jars-protect.md b/contracts/.changeset/long-jars-protect.md
@@ -0,0 +1,5 @@
+---
+'@chainlink/contracts': patch
+---
+
+update error message when node does not exist
diff --git a/contracts/.changeset/new-bugs-draw.md b/contracts/.changeset/new-bugs-draw.md
@@ -0,0 +1,5 @@
+---
+'@chainlink/contracts': patch
+---
+
+#internal
diff --git a/contracts/.changeset/swift-ads-stare.md b/contracts/.changeset/swift-ads-stare.md
@@ -0,0 +1,5 @@
+---
+'@chainlink/contracts': patch
+---
+
+return hashed capability ids