Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into BCF-3247-CR-contra…
Browse files Browse the repository at this point in the history
…ct-read-finality

# Conflicts:
#	integration-tests/go.mod
#	integration-tests/load/go.mod
  • Loading branch information
ilija42 committed Jul 11, 2024
2 parents 9db1442 + fd9c7a3 commit 8d5d76d
Show file tree
Hide file tree
Showing 42 changed files with 960 additions and 108 deletions.
5 changes: 5 additions & 0 deletions .changeset/many-kids-shave.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": patch
---

Go: 1.21.7 => 1.22.5
8 changes: 7 additions & 1 deletion .github/workflows/client-compatibility-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,7 @@ jobs:
TEST_LOG_LEVEL: debug
strategy:
fail-fast: false
max-parallel: 10
matrix:
evm_node: ${{fromJson(needs.prepare-compatibility-matrix.outputs.matrix)}}
runs-on: ubuntu-latest
Expand Down Expand Up @@ -570,6 +571,11 @@ jobs:
echo "$modified_string"
}
echo "TEST_LOG_NAME=$(replace_special_chars "${{ matrix.evm_node.product }}-${{ matrix.evm_node.docker_image }}-test-logs")" >> $GITHUB_ENV
# - name: Collect Workflow Telemetry
# uses: catchpoint/workflow-telemetry-action@v2
# with:
# comment_on_pr: false
# theme: 'dark'
- name: Run Tests
uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@75a9005952a9e905649cfb5a6971fd9429436acd # v2.3.25
with:
Expand Down Expand Up @@ -648,7 +654,7 @@ jobs:
"type": "section",
"text": {
"type": "mrkdwn",
"text": "${{ contains(join(needs.*.result, ','), 'failure') && 'Some tests failed, notifying <@U060CGGPY8H>' || 'All Good!' }}"
"text": "${{ contains(join(needs.*.result, ','), 'failure') && 'Some tests failed, notifying <@S0536FX9ZDZ>' || 'All Good!' }}"
}
},
{
Expand Down
9 changes: 2 additions & 7 deletions .github/workflows/on-demand-vrfv2plus-performance-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,8 @@ on:
type: string
performanceTestType:
description: Performance Test Type of test to run
type: choice
options:
- "Smoke"
- "Soak"
- "Load"
- "Stress"
- "Spike"
type: string
required: true
test_list_regex:
description: "Regex for tests to run"
required: false
Expand Down
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
golang 1.21.7
golang 1.22.5
mockery 2.43.2
nodejs 20.13.1
pnpm 9.4.0
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ regarding Chainlink social accounts, news, and networking.

## Build Chainlink

1. [Install Go 1.21](https://golang.org/doc/install), and add your GOPATH's [bin directory to your PATH](https://golang.org/doc/code.html#GOPATH)
1. [Install Go 1.22](https://golang.org/doc/install), and add your GOPATH's [bin directory to your PATH](https://golang.org/doc/code.html#GOPATH)
- Example Path for macOS `export PATH=$GOPATH/bin:$PATH` & `export GOPATH=/Users/$USER/go`
2. Install [NodeJS v20](https://nodejs.org/en/download/package-manager/) & [pnpm v9 via npm](https://pnpm.io/installation#using-npm).
- It might be easier long term to use [nvm](https://nodejs.org/en/download/package-manager/#nvm) to switch between node versions for different projects. For example, assuming $NODE_VERSION was set to a valid version of NodeJS, you could run: `nvm install $NODE_VERSION && nvm use $NODE_VERSION`
Expand Down
1 change: 1 addition & 0 deletions contracts/scripts/native_solc_compile_all_vrf
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ compileContract vrf/testhelpers/VRFV2LoadTestWithMetrics.sol
compileContract vrf/testhelpers/VRFV2OwnerTestConsumer.sol
compileContractAltOpts vrf/testhelpers/VRFCoordinatorTestV2.sol 10000
compileContract vrf/testhelpers/VRFMockETHLINKAggregator.sol
compileContract vrf/testhelpers/Counter.sol

# Helper contracts
compileContract vrf/interfaces/IAuthorizedReceiver.sol
Expand Down
26 changes: 26 additions & 0 deletions contracts/src/v0.8/vrf/testhelpers/Counter.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// SPDX-License-Identifier: MIT

pragma solidity ^0.8.0;

contract Counter {
error AlwaysRevert();

uint256 public count = 0;

function increment() public returns (uint256) {
count += 1;
return count;
}

function reset() public {
count = 0;
}

function alwaysRevert() public pure {
revert AlwaysRevert();
}

function alwaysRevertWithString() public pure {
revert("always revert");
}
}
3 changes: 2 additions & 1 deletion core/capabilities/launcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func NewLauncher(
registry core.CapabilitiesRegistry,
) *launcher {
return &launcher{
lggr: lggr,
lggr: lggr.Named("CapabilitiesLauncher"),
peerWrapper: peerWrapper,
dispatcher: dispatcher,
registry: registry,
Expand Down Expand Up @@ -134,6 +134,7 @@ func (w *launcher) updateLocalNode(state registrysyncer.State) {
}

func (w *launcher) Launch(ctx context.Context, state registrysyncer.State) error {
w.lggr.Debugw("running capabilities launcher", "state", state)
w.updateLocalNode(state)

// Let's start by updating the list of Peers
Expand Down
2 changes: 1 addition & 1 deletion core/capabilities/remote/trigger_publisher.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func NewTriggerPublisher(config *types.RemoteTriggerConfig, underlying commoncap
messageCache: NewMessageCache[registrationKey, p2ptypes.PeerID](),
registrations: make(map[registrationKey]*pubRegState),
stopCh: make(services.StopChan),
lggr: lggr,
lggr: lggr.Named("TriggerPublisher"),
}
}

Expand Down
2 changes: 1 addition & 1 deletion core/capabilities/remote/trigger_subscriber.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ func NewTriggerSubscriber(config *types.RemoteTriggerConfig, capInfo commoncap.C
messageCache: NewMessageCache[triggerEventKey, p2ptypes.PeerID](),
registeredWorkflows: make(map[string]*subRegState),
stopCh: make(services.StopChan),
lggr: lggr,
lggr: lggr.Named("TriggerSubscriber"),
}
}

Expand Down
4 changes: 2 additions & 2 deletions core/chainlink.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build image: Chainlink binary
FROM golang:1.21-bullseye as buildgo
FROM golang:1.22-bullseye as buildgo
RUN go version
WORKDIR /chainlink

Expand Down Expand Up @@ -31,7 +31,7 @@ RUN go list -m -f "{{.Dir}}" github.com/smartcontractkit/chainlink-feeds | xargs
RUN go list -m -f "{{.Dir}}" github.com/smartcontractkit/chainlink-solana | xargs -I % ln -s % /chainlink-solana

# Build image: Plugins
FROM golang:1.21-bullseye as buildplugins
FROM golang:1.22-bullseye as buildplugins
RUN go version

WORKDIR /chainlink-feeds
Expand Down
Loading

0 comments on commit 8d5d76d

Please sign in to comment.