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.

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

release/2.18.0 -> develop #15076

Closed
wants to merge 10 commits into from
Closed

Conversation

chainchad
Copy link
Collaborator

@chainchad chainchad commented Nov 1, 2024

Fixes merge conflicts by merging develop into this HEAD branch which was branched from release/2.18.0.

Digestible diff

chainchad and others added 10 commits October 22, 2024 14:49
Signed-off-by: chainchad <96362174+chainchad@users.noreply.github.com>
…r from TypeAndVersion (#14861)

* core/services/ocr2/plugins/ccip/internal/ccipdata/factory: check error from TypeAndVersion

* .github: CCIP CODEOWNERS

(cherry picked from commit cc9bafa)
…18.0

core/services/ocr2/plugins/ccip/internal/ccipdata/factory: check error from TypeAndVersion [2.18.0]
…ent-confirmer-false-warning-2.18-cerry-pick

Hotfix/BCFR 1065 prevent confirmer false warning 2.18
* Update DA oracle config struct members to pointers

* Update tests and remake config docs

* suggestions and fix docs_test

* fix config test

(cherry picked from commit b585654)
…bugfix-da-struct

Update DA oracle config struct members to pointers (#15008)
Signed-off-by: chainchad <96362174+chainchad@users.noreply.github.com>
@chainchad chainchad requested review from a team, eutopian and yevshev as code owners November 1, 2024 18:07
@chainchad chainchad requested review from Atrax1, winder, rstout, asoliman92, makramkd, dimkouv, mateusz-sekara and 0xnogo and removed request for a team November 1, 2024 18:07
momentmaker
momentmaker previously approved these changes Nov 1, 2024
Copy link
Contributor

github-actions bot commented Nov 1, 2024

Static analysis results are available

Hey @chainchad, you can view Slither reports in the job summary here or download them as artifact here.
Please check them before merging and make sure you have addressed all issues.

Copy link
Contributor

github-actions bot commented Nov 1, 2024

AER Report: CI Core

aer_workflow , commit , Detect Changes , Clean Go Tidy & Generate , Scheduled Run Frequency , Find New Flaky Tests In Root Project / Find Tests To Run , lint , Core Tests (go_core_tests) , Core Tests (go_core_tests_integration) , Core Tests (go_core_ccip_deployment_tests) , Core Tests (go_core_race_tests) , Core Tests (go_core_fuzz) , Find New Flaky Tests In Deployment Project / Find Tests To Run , Find New Flaky Tests In Root Project / Run Tests (github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller,github.com/smartcon... , Find New Flaky Tests In Root Project / Run Tests (github.com/smartcontractkit/chainlink/v2/core/internal/features,github.com/smartcontra... , Find New Flaky Tests In Root Project / Run Tests (github.com/smartcontractkit/chainlink/v2/core/web/loader,github.com/smartcontractkit/c... , Find New Flaky Tests In Root Project / Run Tests (github.com/smartcontractkit/chainlink/v2/core/cmd,github.com/smartcontractkit/chainlin... , Find New Flaky Tests In Root Project / Run Tests (github.com/smartcontractkit/chainlink/v2/core/services/signatures/ethdss,github.com/sm... , Find New Flaky Tests In Root Project / Run Tests (github.com/smartcontractkit/chainlink/v2/core/services/pg,github.com/smartcontractkit/... , Find New Flaky Tests In Root Project / Run Tests (github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/codec,github.com/smar... , Find New Flaky Tests In Root Project / Run Tests (github.com/smartcontractkit/chainlink/v2/core/services/keystore,github.com/smartcontra... , Find New Flaky Tests In Deployment Project / Run Tests (github.com/smartcontractkit/chainlink/deployment/ccip/changeset,github.com/smartcontra... , Find New Flaky Tests In Deployment Project / Run Tests (github.com/smartcontractkit/chainlink/deployment/environment/devenv,github.com/smartco... , Find New Flaky Tests In Deployment Project / Run Tests (github.com/smartcontractkit/chainlink/deployment/llo/changeset,github.com/smartcontrac... , Find New Flaky Tests In Deployment Project / Run Tests (github.com/smartcontractkit/chainlink/deployment/environment/memory) , Find New Flaky Tests In Deployment Project / Run Tests (github.com/smartcontractkit/chainlink/deployment/environment/nodeclient) , Find New Flaky Tests In Deployment Project / Run Tests (github.com/smartcontractkit/chainlink/deployment/environment/web/sdk/client) , Find New Flaky Tests In Deployment Project / Run Tests (github.com/smartcontractkit/chainlink/deployment/keystone) , Find New Flaky Tests In Deployment Project / Run Tests (github.com/smartcontractkit/chainlink/deployment) , Flakey Test Detection , SonarQube Scan , Find New Flaky Tests In Deployment Project / Report , Find New Flaky Tests In Root Project / Report

1. Integer overflow conversion error:golangci-lint

Source of Error:
<error column="17" line="126" message="G115: integer overflow conversion int -> uint32" severity="high" source="gosec"></error>
<error column="17" line="132" message="G115: integer overflow conversion int64 -> uint32" severity="high" source="gosec"></error>
<error column="17" line="138" message="G115: integer overflow conversion uint -> uint32" severity="high" source="gosec"></error>
<error column="28" line="293" message="G115: integer overflow conversion int64 -> int32" severity="high" source="gosec"></error>
<error column="28" line="304" message="G115: integer overflow conversion int64 -> int32" severity="high" source="gosec"></error>
<error column="60" line="154" message="G115: integer overflow conversion int -> int32" severity="high" source="gosec"></error>
<error column="22" line="39" message="G115: integer overflow conversion int -> uint8" severity="high" source="gosec"></error>
<error column="14" line="251" message="G115: integer overflow conversion int64 -> int32" severity="high" source="gosec"></error>
<error column="41" line="167" message="G115: integer overflow conversion uint64 -> int64" severity="high" source="gosec"></error>
<error column="21" line="66" message="G115: integer overflow conversion uint64 -> uint32" severity="high" source="gosec"></error>
<error column="39" line="137" message="G115: integer overflow conversion int64 -> uint64" severity="high" source="gosec"></error>
<error column="30" line="50" message="G115: integer overflow conversion int64 -> uint64" severity="high" source="gosec"></error>
<error column="105" line="37" message="non-wrapping format verb for fmt.Errorf. Use `%w` to format errors" severity="error" source="errorlint"></error>
<error column="105" line="44" message="non-wrapping format verb for fmt.Errorf. Use `%w` to format errors" severity="error" source="errorlint"></error>
<error column="25" line="334" message="G115: integer overflow conversion uint -> int" severity="high" source="gosec"></error>
<error column="38" line="331" message="G115: integer overflow conversion uint -> int" severity="high" source="gosec"></error>
<error column="18" line="344" message="G115: integer overflow conversion uint -> int" severity="high" source="gosec"></error>
<error column="29" line="58" message="G115: integer overflow conversion uint -> int64" severity="high" source="gosec"></error>
<error column="21" line="109" message="G115: integer overflow conversion int64 -> uint32" severity="high" source="gosec"></error>
<error column="81" line="115" message="directive `//nolint:gosec` is unused for linter \"gosec\"" severity="error" source="nolintlint"></error>
<error column="23" line="160" message="directive `//nolint:gosec // G115` is unused for linter \"gosec\"" severity="error" source="nolintlint"></error>
<error column="17" line="63" message="appendAssign: append result not assigned to the same slice" severity="error" source="gocritic"></error>
<error column="20" line="83" message="G115: integer overflow conversion int -> uint64" severity="high" source="gosec"></error>
<error column="40" line="241" message="G602: slice index out of range" severity="low" source="gosec"></error>
<error column="9" line="257" message="G602: slice index out of range" severity="low" source="gosec"></error>
<error column="9" line="260" message="G602: slice index out of range" severity="low" source="gosec"></error>
<error column="10" line="686" message="G115: integer overflow conversion int -> uint64" severity="high" source="gosec"></error>
<error column="22" line="393" message="G115: integer overflow conversion int64 -> uint64" severity="high" source="gosec"></error>
<error column="17" line="188" message="appendAssign: append result not assigned to the same slice" severity="error" source="gocritic"></error>
<error column="17" line="199" message="appendAssign: append result not assigned to the same slice" severity="error" source="gocritic"></error>
<error column="6" line="110" message="directive `//nolint:errcheck` should provide explanation such as `//nolint:errcheck // this is why`" severity="error" source="nolintlint"></error>
<error column="52" line="28" message="directive `//nolint:gosimple` should provide explanation such as `//nolint:gosimple // this is why`" severity="error" source="nolintlint"></error>
<error column="6" line="25" message="the type name `ErrOverride` should conform to the `XxxError` format" severity="error" source="errname"></error>
<error column="6" line="33" message="the type name `ErrDeprecated` should conform to the `XxxError` format" severity="error" source="errname"></error>
<error column="27" line="30" message="G115: integer overflow conversion uint -> int64" severity="high" source="gosec"></error>
<error column="66" line="151" message="G115: integer overflow conversion int64 -> uint32" severity="high" source="gosec"></error>
<error column="57" line="55" message="non-wrapping format verb for fmt.Errorf. Use `%w` to format errors" severity="error" source="errorlint"></error>
<error column="15" line="58" message="fmt.Errorf can be replaced with errors.New" severity="error" source="perfsprint"></error>
<error column="2" line="18" message="negative-positive: use require.Positive" severity="error" source="testifylint"></error>
<error column="2" line="73" message="error-nil: use require.NoError" severity="error" source="testifylint"></error>
<error column="2" line="80" message="float-compare: use require.InEpsilon (or InDelta)" severity="error" source="testifylint"></error>
<error column="2" line="88" message="float-compare: use require.InEpsilon (or InDelta)" severity="error" source="testifylint"></error>
<error column="2" line="30" message="error-nil: use require.NoError" severity="error" source="testifylint"></error>
<error column="18" line="53" message="dupArg: suspicious method call with the same argument and receiver" severity="error" source="gocritic"></error>
<error column="7" line="41" message="captLocal: `P' should not be capitalized" severity="error" source="gocritic"></error>
<error column="7" line="46" message="captLocal: `P' should not be capitalized" severity="error" source="gocritic"></error>
<error column="7" line="52" message="captLocal: `P' should not be capitalized" severity="error" source="gocritic"></error>
<error column="9" line="259" message="elseif: can replace 'else {if cond {}}' with 'else if cond {}'" severity="error" source="gocritic"></error>
<error column="40" line="241" message="G602: slice index out of range" severity="low" source="gosec"></error>
<error column="9" line="257" message="G602: slice index out of range" severity="low" source="gosec"></error>
<error column="9" line="260" message="G602: slice index out of range" severity="low" source="gosec"></error>
<error column="2" line="244" message="Consider pre-allocating `csaIDs`" severity="error" source="prealloc"></error>
<error column="2" line="248" message="Consider pre-allocating `ethIDs`" severity="error" source="prealloc"></error>
<error column="2" line="252" message="Consider pre-allocating `ocrIDs`" severity="error" source="prealloc"></error>
<error column="2" line="256" message="Consider pre-allocating `ocr2IDs`" severity="error" source="prealloc"></error>
<error column="2" line="260" message="Consider pre-allocating `p2pIDs`" severity="error" source="prealloc"></error>
<error column="2" line="264" message="Consider pre-allocating `cosmosIDs`" severity="error" source="prealloc"></error>
<error column="2" line="268" message="Consider pre-allocating `solanaIDs`" severity="error" source="prealloc"></error>
<error column="2" line="272" message="Consider pre-allocating `starknetIDs`" severity="error" source="prealloc"></error>
<error column="2" line="276" message="Consider pre-allocating `aptosIDs`" severity="error" source="prealloc"></error>
<error column="2" line="280" message="Consider pre-allocating `vrfIDs`" severity="error" source="prealloc"></error>
<error column="2" line="32" message="Consider pre-allocating `ocr2`" severity="error" source="prealloc"></error>
<error column="2" line="33" message="Consider pre-allocating `ocr2_raw`" severity="error" source="prealloc"></error>
<error column="6" line="42" message="the type name `ErrObservationFailed` should conform to the `XxxError` format" severity="error" source="errname"></error>
<error column="2" line="105" message="Consider pre-allocating `rs`" severity="error" source="prealloc"></error>
<error column="2" line="106" message="Consider pre-allocating `ss`" severity="error" source="prealloc"></error>
<error column="24" line="171" message="unnecessary conversion" severity="error" source="unconvert"></error>
<error column="23" line="172" message="unnecessary conversion" severity="error" source="unconvert"></error>
<error column="30" line="161" message="directive `// nolint` should be written without leading space as `//nolint`" severity="error" source="nolintlint"></error>
<error column="30" line="162" message="directive `// nolint` should be written without leading space as `//nolint`" severity="error" source="nolintlint"></error>
<error column="38" line="75" message="directive `//nolint` should mention specific linter such as `//nolint:my-linter`" severity="error" source="nolintlint"></error>
<error column="50" line="165" message="directive `//nolint` should mention specific linter such as `//nolint:my-linter`" severity="error" source="nolintlint"></error>
<error column="3" line="62" message="empty: use require.Empty" severity="error" source="testifylint"></error>
<error column="3" line="87" message="empty: use require.Empty" severity="error" source="testifylint"></error>
<error column="37" line="78" message="fmt.Sprintf can be replaced with faster strconv.FormatUint" severity="error" source="perfsprint"></error>
<error column="14" line="82" message="fmt.Sprintf can be replaced with faster strconv.FormatUint" severity="error" source="perfsprint"></error>
<error column="92" line="125" message="fmt.Sprintf can be replaced with faster hex.EncodeToString" severity="error" source="perfsprint"></error>
<error column="63" line="203" message="fmt.Sprintf can be replaced with faster strconv.Itoa" severity="error" source="perfsprint"></error>
<error column="41" line="167" message="fmt.Sprintf can be replaced with faster strconv.FormatUint" severity="error" source="perfsprint"></error>
<error column="33" line="157" message="unnecessary conversion" severity="error" source="unconvert"></error>
<error column="4" line="473" message="nested context in loop" severity="error" source="fatcontext"></error>
<error column="2" line="396" message="missing cases in switch of type chaintype.ChainType: chaintype.ChainMantle" severity="error" source="exhaustive"></error>
<error column="2" line="212" message="directive `//nolint sqlclosecheck false positive` should match `//nolint sqlclosecheck false positive[:<comma-separated-linters>] [// <explanation>]`" severity="error" source="nolintlint"></error>
<error column="65" line="281" message="directive `//nolint sqlclosecheck false positive` should match `//nolint sqlclosecheck false positive[:<comma-separated-linters>] [// <explanation>]`" severity="error" source="nolintlint"></error>
<error column="6" line="82" message="the type name `ErrJobSpecNoRelayer` should conform to the `XxxError` format" severity="error" source="errname"></error>
<error column="6" line="93" message="the type name `ErrRelayNotEnabled` should conform to the `XxxError` format" severity="error" source="errname"></error>
<error column="9" line="19" message="fmt.Sprintf can be replaced with string concatenation" severity="error" source="perfsprint"></error>
<error column="35" line="61" message="directive `//nolint:containedctx` should provide explanation such as `//nolint:containedctx // this is why`" severity="error" source="nolintlint"></error>
<error column="35" line="72" message="directive `//nolint:containedctx` should provide explanation such as `//nolint:containedctx // this is why`" severity="error" source="nolintlint"></error>
<error column="3" line="1334" message="assignOp: replace `closestBlockNum = closestBlockNum - blockOffset` with `closestBlockNum -= blockOffset`" severity="error" source="gocritic"></error>
<error column="2" line="95" message="captLocal: `GasPriceHeartBeat' should not be capitalized" severity="error" source="gocritic"></error>
<error column="2" line="96" message="captLocal: `DAGasPriceDeviationPPB' should not be capitalized" severity="error" source="gocritic"></error>
<error column="2" line="97" message="captLocal: `ExecGasPriceDeviationPPB' should not be capitalized" severity="error" source="gocritic"></error>
<error column="25" line="29" message="directive `//nolint:staticcheck` should provide explanation such as `//nolint:staticcheck // this is why`" severity="error" source="nolintlint"></error>
<error column="25" line="28" message="directive `//nolint:staticcheck` should provide explanation such as `//nolint:staticcheck // this is why`" severity="error" source="nolintlint"></error>
<error column="35" line="45" message="directive `//nolint:containedctx` should provide explanation such as `//nolint:containedctx // this is why`" severity="error" source="nolintlint"></error>
<error column="9" line="93" message="elseif: can replace 'else {if cond {}}' with 'else if cond {}'" severity="error" source="gocritic"></error>
<error column="19" line="109" message="fmt.Sprintf can be replaced with string concatenation" severity="error" source="perfsprint"></error>
<error column="21" line="500" message="shadow: declaration of \"err\" shadows declaration at line 459" severity="error" source="govet"></error>
<error column="2" line="79" message="ifElseChain: rewrite if-else to switch statement" severity="error" source="gocritic"></error>
<error column="19" line="48" message="fmt.Sprintf can be replaced with string concatenation" severity="error" source="perfsprint"></error>
<error column="90" line="135" message="underef: could simplify (*mc.LinkFeedID).String to mc.LinkFeedID.String" severity="error" source="gocritic"></error>
<error column="90" line="136" message="underef: could simplify (*mc.NativeFeedID).String to mc.NativeFeedID.String" severity="error" source="gocritic"></error>
<error column="5" line="13" message="var-naming: var v1FeedId should be v1FeedID" severity="warning" source="revive"></error>
<error column="5" line="14" message="var-naming: var v2FeedId should be v2FeedID" severity="warning" source="revive"></error>
<error column="33" line="49" message="G115: integer overflow conversion uint64 -> int64" severity="high" source="gosec"></error>
<error column="4" line="98" message="error-nil: use assert.NoError" severity="error" source="testifylint"></error>
<error column="5" line="112" message="len: use
</cicore>

@chainchad chainchad changed the title chore/release/2.18.0 to develop chore/release/2.18.0 to fix v2.18.0 merge conflicts Nov 1, 2024
@chainchad chainchad changed the title chore/release/2.18.0 to fix v2.18.0 merge conflicts Fix v2.18.0 merge conflicts Nov 1, 2024
vyzaldysanchez
vyzaldysanchez previously approved these changes Nov 4, 2024
@chainchad chainchad changed the base branch from release/2.18.0 to develop November 4, 2024 19:04
@chainchad chainchad dismissed stale reviews from vyzaldysanchez and momentmaker November 4, 2024 19:04

The base branch was changed.

@chainchad chainchad requested a review from a team as a code owner November 4, 2024 19:04
@chainchad chainchad changed the title Fix v2.18.0 merge conflicts release/2.18.0 -> develop Nov 4, 2024
@chainchad chainchad closed this Nov 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants