Skip to content

Commit 5caea7a

Browse files
committed
Merge branch 'develop' into dx-3862-release-tests
2 parents 8e2e33c + 8597d97 commit 5caea7a

451 files changed

Lines changed: 2035 additions & 76889 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.changeset/gold-kites-bake.md

Lines changed: 0 additions & 5 deletions
This file was deleted.
File renamed without changes.

.github/CODEOWNERS

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@
3838
/core/services/webhook/ @smartcontractkit/foundations @smartcontractkit/bix-framework @smartcontractkit/core
3939
/core/services/llo/ @smartcontractkit/data-streams-engineers @smartcontractkit/core
4040

41-
# CCIP
42-
/core/services/ccip/ @smartcontractkit/ccip
43-
/core/services/ocr2/plugins/ccip/ @smartcontractkit/ccip
44-
4541
# VRF-related services
4642
/core/services/vrf/ @smartcontractkit/dev-services @smartcontractkit/core
4743
/core/services/blockhashstore/ @smartcontractkit/dev-services @smartcontractkit/core

.github/workflows/build-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ jobs:
255255
run: |
256256
# Compute image tag by removing 'v' prefix
257257
# Examples:
258-
# v2.34.0-rc.1 -> 2.34.0-rc.1
258+
# v2.34.0 -> 2.34.0
259259
tag_without_v="${GIT_TAG#v}"
260260
echo "image-tag=$tag_without_v" | tee -a "$GITHUB_OUTPUT"
261261
- name: Emit release image tagged event

.github/workflows/post-build-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: "Post Build, Sign and Publish Chainlink"
22
on:
3-
# # to be used with post release tests
3+
# # to be used with pre-release tests
44
repository_dispatch:
55
types: [ pre-release-image-published ]
66

.mockery.yaml

Lines changed: 0 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,6 @@ packages:
117117
interfaces:
118118
BHS:
119119
Timer:
120-
github.com/smartcontractkit/chainlink/v2/core/services/ccip:
121-
interfaces:
122-
ORM:
123120
github.com/smartcontractkit/chainlink/v2/core/services/chainlink:
124121
interfaces:
125122
Application:
@@ -308,114 +305,6 @@ packages:
308305
dir: core/capabilities/targets/mocks
309306
interfaces:
310307
ContractWriter:
311-
github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_2_0/evm_2_evm_offramp:
312-
config:
313-
dir: core/services/ocr2/plugins/ccip/internal/ccipdata/mocks/contracts
314-
filename: evm2_evm_off_ramp_interface.go
315-
outpkg: mock_contracts
316-
interfaces:
317-
EVM2EVMOffRampInterface:
318-
github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/cache:
319-
config:
320-
filename: chain_health_mock.go
321-
interfaces:
322-
ChainHealthcheck:
323-
github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata:
324-
interfaces:
325-
CommitStoreReader:
326-
config:
327-
filename: commit_store_reader_mock.go
328-
OffRampReader:
329-
config:
330-
filename: offramp_reader_mock.go
331-
OnRampReader:
332-
config:
333-
filename: onramp_reader_mock.go
334-
PriceRegistryReader:
335-
config:
336-
filename: price_registry_reader_mock.go
337-
FeeEstimatorConfigReader:
338-
config:
339-
filename: fee_estimator_config_mock.go
340-
TokenPoolReader:
341-
config:
342-
filename: token_pool_reader_mock.go
343-
USDCReader:
344-
config:
345-
filename: usdc_reader_mock.go
346-
github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/estimatorconfig:
347-
interfaces:
348-
GasPriceInterceptor:
349-
config:
350-
filename: gas_price_interceptor_mock.go
351-
github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata/batchreader:
352-
config:
353-
filename: token_pool_batched_reader_mock.go
354-
interfaces:
355-
TokenPoolBatchedReader:
356-
github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata/ccipdataprovider:
357-
config:
358-
filename: price_registry_mock.go
359-
interfaces:
360-
PriceRegistry:
361-
github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdb:
362-
config:
363-
filename: price_service_mock.go
364-
interfaces:
365-
PriceService:
366-
github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/pricegetter:
367-
config:
368-
filename: mock.go
369-
dir: "{{ .InterfaceDir }}/"
370-
outpkg: pricegetter
371-
interfaces:
372-
PriceGetter:
373-
config:
374-
mockname: "Mock{{ .InterfaceName }}"
375-
filename: mock.go
376-
AllTokensPriceGetter:
377-
config:
378-
mockname: "Mock{{ .InterfaceName }}"
379-
filename: all_price_getter_mock.go
380-
github.com/smartcontractkit/chainlink-evm/pkg/statuschecker:
381-
config:
382-
dir: "core/services/relay/evm/mocks/statuschecker"
383-
interfaces:
384-
CCIPTransactionStatusChecker:
385-
github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/rpclib:
386-
config:
387-
outpkg: rpclibmocks
388-
interfaces:
389-
EvmBatchCaller:
390-
config:
391-
filename: evm_mock.go
392-
dir: "{{ .InterfaceDir }}/rpclibmocks"
393-
github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/prices:
394-
config:
395-
dir: "{{ .InterfaceDir }}/"
396-
outpkg: prices
397-
interfaces:
398-
GasPriceEstimatorCommit:
399-
config:
400-
mockname: "Mock{{ .InterfaceName }}"
401-
filename: gas_price_estimator_commit_mock.go
402-
GasPriceEstimatorExec:
403-
config:
404-
mockname: "Mock{{ .InterfaceName }}"
405-
filename: gas_price_estimator_exec_mock.go
406-
GasPriceEstimator:
407-
config:
408-
mockname: "Mock{{ .InterfaceName }}"
409-
filename: gas_price_estimator_mock.go
410-
github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/tokendata:
411-
config:
412-
filename: reader_mock.go
413-
dir: "{{ .InterfaceDir }}/"
414-
outpkg: tokendata
415-
interfaces:
416-
Reader:
417-
config:
418-
mockname: "Mock{{ .InterfaceName }}"
419308
github.com/smartcontractkit/chainlink/v2/core/services/registrysyncer:
420309
interfaces:
421310
ORM:

CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# Changelog Chainlink Core
22

3+
## 2.44.0
4+
5+
### Minor Changes
6+
7+
- [#22043](https://github.com/smartcontractkit/chainlink/pull/22043) [`6c93c02`](https://github.com/smartcontractkit/chainlink/commit/6c93c029a545e4c1ab9c884ef5e96399b010db1b) - Wire confidential relay service into CRE startup #added
8+
9+
- [#22014](https://github.com/smartcontractkit/chainlink/pull/22014) [`877e469`](https://github.com/smartcontractkit/chainlink/commit/877e46974b2b3453a650dd35846f2972a0262bd9) - Minor bump to start next version
10+
11+
### Patch Changes
12+
13+
- [#22044](https://github.com/smartcontractkit/chainlink/pull/22044) [`de6ecbc`](https://github.com/smartcontractkit/chainlink/commit/de6ecbc8a15c06800706710c1f59cc970cafb631) - Support HTTP URLs in file fetcher for local confidential workflow testing, add system-test instrumentation #changed
14+
15+
- [#22084](https://github.com/smartcontractkit/chainlink/pull/22084) [`290a3e1`](https://github.com/smartcontractkit/chainlink/commit/290a3e1f46b6bdb2648f1ffeec3e43472a0b9203) - Deprecate InsecurePPROFHeap setting. Remove limitation.
16+
17+
- [#22045](https://github.com/smartcontractkit/chainlink/pull/22045) [`bd5e9a8`](https://github.com/smartcontractkit/chainlink/commit/bd5e9a85f258fa69638ef0986c235d1155d7fa98) - Remove unused BinaryURLResolver from ConfidentialModule (PRIV-389 credentials sidecar)
18+
319
## 2.43.0
420

521
### Minor Changes

core/capabilities/ccip/ccipevm/commitcodec.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
cciptypes "github.com/smartcontractkit/chainlink-ccip/pkg/types/ccipocr3"
1313

1414
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_6_0/ccip_encoding_utils"
15-
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/abihelpers"
15+
"github.com/smartcontractkit/chainlink/v2/core/utils/abihelpers"
1616
)
1717

1818
var (

core/capabilities/ccip/ccipevm/executecodec.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_6_0/offramp"
1515
cciptypes "github.com/smartcontractkit/chainlink-ccip/pkg/types/ccipocr3"
1616
"github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
17-
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/abihelpers"
17+
"github.com/smartcontractkit/chainlink/v2/core/utils/abihelpers"
1818
)
1919

2020
// ExecutePluginCodecV1 is a codec for encoding and decoding execute plugin reports.

core/capabilities/ccip/ccipevm/tokendata.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
cciptypes "github.com/smartcontractkit/chainlink-ccip/pkg/types/ccipocr3"
77

8-
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/abihelpers"
8+
"github.com/smartcontractkit/chainlink/v2/core/utils/abihelpers"
99
)
1010

1111
type usdcAttestationPayload struct {

0 commit comments

Comments
 (0)