Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.15 merge #1401

Merged
merged 35 commits into from
Sep 3, 2024
Merged

2.15 merge #1401

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
2207a38
[AUTO-11176] fix automation chaos test (#13904)
anirudhwarrier Jul 19, 2024
5b668c1
Remove the old log buffer (#13821)
ferglor Jul 19, 2024
4565fef
run tests also if CL image build was skipped (tag), fix notification …
Tofel Jul 19, 2024
518350d
Ukflake TestFunctionsConnectorHandler (#13916)
bolekk Jul 23, 2024
2b09956
fail explicitly if base_ref is empty in PR/MQ (#13910)
Tofel Jul 23, 2024
780d304
Notify slack on new (pre)release tags (#13914)
chainchad Jul 23, 2024
c5224df
add startonce protection to syncer (#13917)
ettec Jul 24, 2024
d777fd8
[KS-370] Pass config from onchain registry to execute calls (#13750)
cedric-cordenier Jul 24, 2024
3ecb954
@chainlink.contracts release v1.2.0 (#13895)
chainchad Jul 24, 2024
e7552f8
Small fixes (#13926)
cedric-cordenier Jul 25, 2024
d6ebada
keystone end to end integration tests (#13838)
ettec Jul 28, 2024
683a12e
FUN-1527 Add updateFromPrevious method to Functions ToS (#13795)
KuphJr Jul 28, 2024
27d9c71
KS-391: Capabilities Registry Fixes (#13937)
cds95 Jul 29, 2024
ca6e1c2
check for nils in log processor call (#13940)
Tofel Jul 29, 2024
d150bc6
bump deps (#13901)
jmank88 Jul 29, 2024
9f850e3
Bump version and update CHANGELOG for core v2.14.0 (#13752)
snehaagni Jul 29, 2024
9bd5793
Bump version and update CHANGELOG fore core v2.15.0
chainchad Jul 29, 2024
e9d23b9
Fix syntax error in workflow (#13952)
chainchad Jul 29, 2024
e12146a
Fix syntax error in workflow (#13952)
chainchad Jul 29, 2024
b028bf5
Bump slack-notify-git-ref action for fixes
chainchad Jul 30, 2024
f5b81f6
Bump slack-notify-git-ref action for fixes
chainchad Jul 30, 2024
136e074
Cleanup old CRIB file
chainchad Jul 31, 2024
d7a70b2
Cleanup accidental CRIB remnant
chainchad Jul 31, 2024
69cccdf
Use changeset github changelog generator
chainchad Aug 1, 2024
96e7bc1
Merge pull request #13991 from smartcontractkit/chore/release/2.15.0-…
chainchad Aug 1, 2024
c919da6
Fix version
chainchad Aug 6, 2024
606cb3f
Fix version
chainchad Aug 6, 2024
883c9f9
Finalize date on changelog for 2.15.0 (#14144)
chainchad Aug 19, 2024
43f261e
Merge tag 'v2.15.0' into 2.15-merge
mateusz-sekara Sep 2, 2024
f105b1b
Post merge fixes
mateusz-sekara Sep 2, 2024
084cfec
Merge f105b1b56a0f3cb312200fe48eba5486ddca95c1 into a793f34cdd1e87b31…
mateusz-sekara Sep 2, 2024
66f42c9
Update gethwrappers
app-token-issuer-infra-releng[bot] Sep 2, 2024
10ecf42
Adding missing prom reporter. Post merge fixes
mateusz-sekara Sep 2, 2024
a9b8f33
Merge branch 'ccip-develop' into 2.15-merge
mateusz-sekara Sep 3, 2024
554f7c7
Removing .swp file, probably accidentally committed
mateusz-sekara Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions .mockery.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,14 +258,10 @@ packages:
ORM:
Runner:
PipelineParamUnmarshaler:
github.com/smartcontractkit/chainlink/v2/core/services/headreporter:
github.com/smartcontractkit/chainlink/v2/core/services/promreporter:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not familiar with prom or headreporter. What's the reason for removing headreporter completely like this?

Copy link
Contributor Author

@mateusz-sekara mateusz-sekara Sep 3, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's the state of the repo on v2.15.0. It seems that promreporter replaced headreporter

config:
dir: "{{ .InterfaceDir }}"
filename: "{{ .InterfaceName | snakecase }}_mock.go"
inpackage: true
mockname: "Mock{{ .InterfaceName | camelcase }}"
dir: core/internal/mocks
interfaces:
HeadReporter:
PrometheusBackend:
github.com/smartcontractkit/libocr/commontypes:
config:
Expand Down
18 changes: 9 additions & 9 deletions contracts/gas-snapshots/functions.gas-snapshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ FunctionsCoordinator_SetDONPublicKey:test_SetDONPublicKey_Success() (gas: 88970)
FunctionsCoordinator_SetThresholdPublicKey:test_SetThresholdPublicKey_RevertNotOwner() (gas: 13915)
FunctionsCoordinator_SetThresholdPublicKey:test_SetThresholdPublicKey_Success() (gas: 513165)
FunctionsCoordinator_StartRequest:test_StartRequest_RevertIfNotRouter() (gas: 22802)
FunctionsCoordinator_StartRequest:test_StartRequest_Success() (gas: 150150)
FunctionsCoordinator_StartRequest:test_StartRequest_Success() (gas: 152650)
FunctionsCoordinator__IsTransmitter:test__IsTransmitter_SuccessFound() (gas: 15106)
FunctionsCoordinator__IsTransmitter:test__IsTransmitter_SuccessNotFound() (gas: 22916)
FunctionsRequest_DEFAULT_BUFFER_SIZE:test_DEFAULT_BUFFER_SIZE() (gas: 3089)
Expand Down Expand Up @@ -200,7 +200,7 @@ FunctionsTermsOfServiceAllowList_AcceptTermsOfService:test_AcceptTermsOfService_
FunctionsTermsOfServiceAllowList_AcceptTermsOfService:test_AcceptTermsOfService_RevertIfBlockedSender() (gas: 89013)
FunctionsTermsOfServiceAllowList_AcceptTermsOfService:test_AcceptTermsOfService_RevertIfInvalidSigner() (gas: 23620)
FunctionsTermsOfServiceAllowList_AcceptTermsOfService:test_AcceptTermsOfService_RevertIfRecipientContractIsNotSender() (gas: 1866619)
FunctionsTermsOfServiceAllowList_AcceptTermsOfService:test_AcceptTermsOfService_RevertIfRecipientIsNotSender() (gas: 26026)
FunctionsTermsOfServiceAllowList_AcceptTermsOfService:test_AcceptTermsOfService_RevertIfRecipientIsNotSender() (gas: 28526)
FunctionsTermsOfServiceAllowList_AcceptTermsOfService:test_AcceptTermsOfService_SuccessIfAcceptingForContract() (gas: 1946966)
FunctionsTermsOfServiceAllowList_AcceptTermsOfService:test_AcceptTermsOfService_SuccessIfAcceptingForSelf() (gas: 104555)
FunctionsTermsOfServiceAllowList_BlockSender:test_BlockSender_RevertIfNotOwner() (gas: 15535)
Expand Down Expand Up @@ -232,10 +232,10 @@ FunctionsTermsOfServiceAllowList_UpdateConfig:test_UpdateConfig_Success() (gas:
Gas_AcceptTermsOfService:test_AcceptTermsOfService_Gas() (gas: 84725)
Gas_AddConsumer:test_AddConsumer_Gas() (gas: 79140)
Gas_CreateSubscription:test_CreateSubscription_Gas() (gas: 73419)
Gas_FulfillRequest_DuplicateRequestID:test_FulfillRequest_DuplicateRequestID_MaximumGas() (gas: 20717)
Gas_FulfillRequest_DuplicateRequestID:test_FulfillRequest_DuplicateRequestID_MinimumGas() (gas: 20157)
Gas_FulfillRequest_Success:test_FulfillRequest_Success_MaximumGas() (gas: 501339)
Gas_FulfillRequest_Success:test_FulfillRequest_Success_MinimumGas() (gas: 202509)
Gas_FundSubscription:test_FundSubscription_Gas() (gas: 38524)
Gas_SendRequest:test_SendRequest_MaximumGas() (gas: 988895)
Gas_SendRequest:test_SendRequest_MinimumGas() (gas: 181579)
Gas_FulfillRequest_DuplicateRequestID:test_FulfillRequest_DuplicateRequestID_MaximumGas() (gas: 20562)
Gas_FulfillRequest_DuplicateRequestID:test_FulfillRequest_DuplicateRequestID_MinimumGas() (gas: 20024)
Gas_FulfillRequest_Success:test_FulfillRequest_Success_MaximumGas() (gas: 501184)
Gas_FulfillRequest_Success:test_FulfillRequest_Success_MinimumGas() (gas: 202376)
Gas_FundSubscription:test_FundSubscription_Gas() (gas: 38518)
Gas_SendRequest:test_SendRequest_MaximumGas() (gas: 984338)
Gas_SendRequest:test_SendRequest_MinimumGas() (gas: 181561)
2 changes: 2 additions & 0 deletions core/internal/cltest/cltest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,8 @@ func NewApplicationWithConfig(t testing.TB, cfg chainlink.GeneralConfig, flagsAn
LoopRegistry: plugins.NewLoopRegistry(lggr, nil),
MercuryPool: mercuryPool,
CapabilitiesRegistry: capabilitiesRegistry,
CapabilitiesDispatcher: dispatcher,
CapabilitiesPeerWrapper: peerWrapper,
})

require.NoError(t, err)
Expand Down
204 changes: 204 additions & 0 deletions core/internal/mocks/prometheus_backend.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading