evm: Bump chainlink-common version to commit 6d926be950a6f6ca289a84ed…

…ad938d4eef2ee337 (#13612) * evm: Bump chainlink-common version to commit 6d926be950a6f6ca289a84edad938d4eef2ee337 * evm: Fix tests * Fix default sorting order in dsl parser to match common test --------- Co-authored-by: ilija <[email protected]>
smartcontractkit · Jun 18, 2024 · 9810856 · 9810856
1 parent 42c74fc
commit 9810856
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 23 deletions.
diff --git a/.changeset/chilled-panthers-joke.md b/.changeset/chilled-panthers-joke.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal bump `chainlink-common` version to commit 6d926be950a6f6ca289a84edad938d4eef2ee337.
diff --git a/core/chains/evm/logpoller/parser.go b/core/chains/evm/logpoller/parser.go
@@ -21,7 +21,7 @@ const (
 	timestampFieldName = "block_timestamp"
 	txHashFieldName    = "tx_hash"
 	eventSigFieldName  = "event_sig"
-	defaultSort        = "block_number DESC, log_index DESC"
+	defaultSort        = "block_number ASC, log_index ASC"
 )
 
 var (

diff --git a/core/scripts/go.mod b/core/scripts/go.mod
@@ -24,7 +24,7 @@ require (
 	github.com/prometheus/client_golang v1.17.0
 	github.com/shopspring/decimal v1.3.1
 	github.com/smartcontractkit/chainlink-automation v1.0.4
-	github.com/smartcontractkit/chainlink-common v0.1.7-0.20240618130725-a238e16838db
+	github.com/smartcontractkit/chainlink-common v0.1.7-0.20240618152957-6d926be950a6
 	github.com/smartcontractkit/chainlink-vrf v0.0.0-20240222010609-cd67d123c772
 	github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000
 	github.com/smartcontractkit/libocr v0.0.0-20240419185742-fd3cab206b2c

diff --git a/core/scripts/go.sum b/core/scripts/go.sum
@@ -1212,8 +1212,8 @@ github.com/smartcontractkit/chain-selectors v1.0.10 h1:t9kJeE6B6G+hKD0GYR4kGJSCq
 github.com/smartcontractkit/chain-selectors v1.0.10/go.mod h1:d4Hi+E1zqjy9HqMkjBE5q1vcG9VGgxf5VxiRHfzi2kE=
 github.com/smartcontractkit/chainlink-automation v1.0.4 h1:iyW181JjKHLNMnDleI8umfIfVVlwC7+n5izbLSFgjw8=
 github.com/smartcontractkit/chainlink-automation v1.0.4/go.mod h1:u4NbPZKJ5XiayfKHD/v3z3iflQWqvtdhj13jVZXj/cM=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20240618130725-a238e16838db h1:ShcEAs8w5MYag3ku4Zz+KYeBpDQQQ3T4oTf2muGUbnU=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20240618130725-a238e16838db/go.mod h1:L32xvCpk84Nglit64OhySPMP1tM3TTBK7Tw0qZl7Sd4=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20240618152957-6d926be950a6 h1:4N8c0U+oNtdvZHhWmRCtyGHwW3KI7VvSGr5770PNrM4=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20240618152957-6d926be950a6/go.mod h1:L32xvCpk84Nglit64OhySPMP1tM3TTBK7Tw0qZl7Sd4=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240524214833-c362c2ebbd2d h1:5tgMC5Gi2UAOKZ+m28W8ubjLeR0pQCAcrz6eQ0rW510=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240524214833-c362c2ebbd2d/go.mod h1:0UNuO3nDt9MFsZPaHJBEUolxVkN0iC69j1ccDp95e8k=
 github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240220203239-09be0ea34540 h1:xFSv8561jsLtF6gYZr/zW2z5qUUAkcFkApin2mnbYTo=

diff --git a/core/services/relay/evm/chain_writer.go b/core/services/relay/evm/chain_writer.go
@@ -188,8 +188,8 @@ func (w *chainWriter) GetFeeComponents(ctx context.Context) (*commontypes.ChainF
 	l1Oracle := w.ge.L1Oracle()
 	if l1Oracle == nil {
 		return &commontypes.ChainFeeComponents{
-			ExecutionFee:        *gasPrice,
-			DataAvailabilityFee: *big.NewInt(0),
+			ExecutionFee:        gasPrice,
+			DataAvailabilityFee: big.NewInt(0),
 		}, nil
 	}
 	l1OracleFee, err := l1Oracle.GasPrice(ctx)
@@ -198,8 +198,8 @@ func (w *chainWriter) GetFeeComponents(ctx context.Context) (*commontypes.ChainF
 	}
 
 	return &commontypes.ChainFeeComponents{
-		ExecutionFee:        *gasPrice,
-		DataAvailabilityFee: *big.NewInt(l1OracleFee.Int64()),
+		ExecutionFee:        gasPrice,
+		DataAvailabilityFee: big.NewInt(l1OracleFee.Int64()),
 	}, nil
 }
 

diff --git a/core/services/relay/evm/chain_writer_test.go b/core/services/relay/evm/chain_writer_test.go
@@ -73,17 +73,17 @@ func TestChainWriter(t *testing.T) {
 		t.Run("Returns valid FeeComponents", func(t *testing.T) {
 			feeComponents, err = cw.GetFeeComponents(ctx)
 			require.NoError(t, err)
-			assert.Equal(t, big.NewInt(1000000002), &feeComponents.ExecutionFee)
-			assert.Equal(t, big.NewInt(1000000004), &feeComponents.DataAvailabilityFee)
+			assert.Equal(t, big.NewInt(1000000002), feeComponents.ExecutionFee)
+			assert.Equal(t, big.NewInt(1000000004), feeComponents.DataAvailabilityFee)
 		})
 
 		ge.On("L1Oracle", mock.Anything).Return(nil).Twice()
 
 		t.Run("Returns valid FeeComponents with no L1Oracle", func(t *testing.T) {
 			feeComponents, err = cw.GetFeeComponents(ctx)
 			require.NoError(t, err)
-			assert.Equal(t, big.NewInt(1000000002), &feeComponents.ExecutionFee)
-			assert.Equal(t, big.NewInt(0), &feeComponents.DataAvailabilityFee)
+			assert.Equal(t, big.NewInt(1000000002), feeComponents.ExecutionFee)
+			assert.Equal(t, big.NewInt(0), feeComponents.DataAvailabilityFee)
 		})
 
 		t.Run("Returns Legacy Fee in absence of Dynamic Fee", func(t *testing.T) {
@@ -94,8 +94,8 @@ func TestChainWriter(t *testing.T) {
 			}, uint64(0), nil).Once()
 			feeComponents, err = cw.GetFeeComponents(ctx)
 			require.NoError(t, err)
-			assert.Equal(t, big.NewInt(1000000001), &feeComponents.ExecutionFee)
-			assert.Equal(t, big.NewInt(0), &feeComponents.DataAvailabilityFee)
+			assert.Equal(t, big.NewInt(1000000001), feeComponents.ExecutionFee)
+			assert.Equal(t, big.NewInt(0), feeComponents.DataAvailabilityFee)
 		})
 
 		t.Run("Fails when neither legacy or dynamic fee is available", func(t *testing.T) {

diff --git a/go.mod b/go.mod
@@ -72,7 +72,7 @@ require (
 	github.com/shopspring/decimal v1.3.1
 	github.com/smartcontractkit/chain-selectors v1.0.10
 	github.com/smartcontractkit/chainlink-automation v1.0.4
-	github.com/smartcontractkit/chainlink-common v0.1.7-0.20240618130725-a238e16838db
+	github.com/smartcontractkit/chainlink-common v0.1.7-0.20240618152957-6d926be950a6
 	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240524214833-c362c2ebbd2d
 	github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240220203239-09be0ea34540
 	github.com/smartcontractkit/chainlink-feeds v0.0.0-20240522213638-159fb2d99917

diff --git a/go.sum b/go.sum
@@ -1171,8 +1171,8 @@ github.com/smartcontractkit/chain-selectors v1.0.10 h1:t9kJeE6B6G+hKD0GYR4kGJSCq
 github.com/smartcontractkit/chain-selectors v1.0.10/go.mod h1:d4Hi+E1zqjy9HqMkjBE5q1vcG9VGgxf5VxiRHfzi2kE=
 github.com/smartcontractkit/chainlink-automation v1.0.4 h1:iyW181JjKHLNMnDleI8umfIfVVlwC7+n5izbLSFgjw8=
 github.com/smartcontractkit/chainlink-automation v1.0.4/go.mod h1:u4NbPZKJ5XiayfKHD/v3z3iflQWqvtdhj13jVZXj/cM=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20240618130725-a238e16838db h1:ShcEAs8w5MYag3ku4Zz+KYeBpDQQQ3T4oTf2muGUbnU=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20240618130725-a238e16838db/go.mod h1:L32xvCpk84Nglit64OhySPMP1tM3TTBK7Tw0qZl7Sd4=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20240618152957-6d926be950a6 h1:4N8c0U+oNtdvZHhWmRCtyGHwW3KI7VvSGr5770PNrM4=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20240618152957-6d926be950a6/go.mod h1:L32xvCpk84Nglit64OhySPMP1tM3TTBK7Tw0qZl7Sd4=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240524214833-c362c2ebbd2d h1:5tgMC5Gi2UAOKZ+m28W8ubjLeR0pQCAcrz6eQ0rW510=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240524214833-c362c2ebbd2d/go.mod h1:0UNuO3nDt9MFsZPaHJBEUolxVkN0iC69j1ccDp95e8k=
 github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240220203239-09be0ea34540 h1:xFSv8561jsLtF6gYZr/zW2z5qUUAkcFkApin2mnbYTo=

diff --git a/integration-tests/go.mod b/integration-tests/go.mod
@@ -27,7 +27,7 @@ require (
 	github.com/shopspring/decimal v1.3.1
 	github.com/slack-go/slack v0.12.2
 	github.com/smartcontractkit/chainlink-automation v1.0.4
-	github.com/smartcontractkit/chainlink-common v0.1.7-0.20240618130725-a238e16838db
+	github.com/smartcontractkit/chainlink-common v0.1.7-0.20240618152957-6d926be950a6
 	github.com/smartcontractkit/chainlink-testing-framework v1.30.9
 	github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868
 	github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000

diff --git a/integration-tests/go.sum b/integration-tests/go.sum
@@ -1512,8 +1512,8 @@ github.com/smartcontractkit/chain-selectors v1.0.10 h1:t9kJeE6B6G+hKD0GYR4kGJSCq
 github.com/smartcontractkit/chain-selectors v1.0.10/go.mod h1:d4Hi+E1zqjy9HqMkjBE5q1vcG9VGgxf5VxiRHfzi2kE=
 github.com/smartcontractkit/chainlink-automation v1.0.4 h1:iyW181JjKHLNMnDleI8umfIfVVlwC7+n5izbLSFgjw8=
 github.com/smartcontractkit/chainlink-automation v1.0.4/go.mod h1:u4NbPZKJ5XiayfKHD/v3z3iflQWqvtdhj13jVZXj/cM=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20240618130725-a238e16838db h1:ShcEAs8w5MYag3ku4Zz+KYeBpDQQQ3T4oTf2muGUbnU=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20240618130725-a238e16838db/go.mod h1:L32xvCpk84Nglit64OhySPMP1tM3TTBK7Tw0qZl7Sd4=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20240618152957-6d926be950a6 h1:4N8c0U+oNtdvZHhWmRCtyGHwW3KI7VvSGr5770PNrM4=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20240618152957-6d926be950a6/go.mod h1:L32xvCpk84Nglit64OhySPMP1tM3TTBK7Tw0qZl7Sd4=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240524214833-c362c2ebbd2d h1:5tgMC5Gi2UAOKZ+m28W8ubjLeR0pQCAcrz6eQ0rW510=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240524214833-c362c2ebbd2d/go.mod h1:0UNuO3nDt9MFsZPaHJBEUolxVkN0iC69j1ccDp95e8k=
 github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240220203239-09be0ea34540 h1:xFSv8561jsLtF6gYZr/zW2z5qUUAkcFkApin2mnbYTo=

diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod
@@ -16,7 +16,7 @@ require (
 	github.com/rs/zerolog v1.30.0
 	github.com/slack-go/slack v0.12.2
 	github.com/smartcontractkit/chainlink-automation v1.0.4
-	github.com/smartcontractkit/chainlink-common v0.1.7-0.20240618130725-a238e16838db
+	github.com/smartcontractkit/chainlink-common v0.1.7-0.20240618152957-6d926be950a6
 	github.com/smartcontractkit/chainlink-testing-framework v1.30.9
 	github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240214231432-4ad5eb95178c
 	github.com/smartcontractkit/chainlink/v2 v2.9.0-beta0.0.20240216210048-da02459ddad8

diff --git a/integration-tests/load/go.sum b/integration-tests/load/go.sum
@@ -1502,8 +1502,8 @@ github.com/smartcontractkit/chain-selectors v1.0.10 h1:t9kJeE6B6G+hKD0GYR4kGJSCq
 github.com/smartcontractkit/chain-selectors v1.0.10/go.mod h1:d4Hi+E1zqjy9HqMkjBE5q1vcG9VGgxf5VxiRHfzi2kE=
 github.com/smartcontractkit/chainlink-automation v1.0.4 h1:iyW181JjKHLNMnDleI8umfIfVVlwC7+n5izbLSFgjw8=
 github.com/smartcontractkit/chainlink-automation v1.0.4/go.mod h1:u4NbPZKJ5XiayfKHD/v3z3iflQWqvtdhj13jVZXj/cM=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20240618130725-a238e16838db h1:ShcEAs8w5MYag3ku4Zz+KYeBpDQQQ3T4oTf2muGUbnU=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20240618130725-a238e16838db/go.mod h1:L32xvCpk84Nglit64OhySPMP1tM3TTBK7Tw0qZl7Sd4=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20240618152957-6d926be950a6 h1:4N8c0U+oNtdvZHhWmRCtyGHwW3KI7VvSGr5770PNrM4=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20240618152957-6d926be950a6/go.mod h1:L32xvCpk84Nglit64OhySPMP1tM3TTBK7Tw0qZl7Sd4=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240524214833-c362c2ebbd2d h1:5tgMC5Gi2UAOKZ+m28W8ubjLeR0pQCAcrz6eQ0rW510=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240524214833-c362c2ebbd2d/go.mod h1:0UNuO3nDt9MFsZPaHJBEUolxVkN0iC69j1ccDp95e8k=
 github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240220203239-09be0ea34540 h1:xFSv8561jsLtF6gYZr/zW2z5qUUAkcFkApin2mnbYTo=