Skip to content

Commit e06a6f9

Browse files
committed
Merge branch 'develop' into fix/inject-evm-df-decoder
2 parents 99d1f47 + c056838 commit e06a6f9

Some content is hidden

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

58 files changed

+751
-367
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ contracts/scripts/requirements.txt @smartcontractkit/core
170170
.nvmrc @smartcontractkit/core
171171
contracts/package.json @smartcontractkit/foundations @smartcontractkit/core
172172
contracts/pnpm.lock @smartcontractkit/core
173+
go.md @smartcontractkit/core @smartcontractkit/foundations
173174
go.mod @smartcontractkit/core @smartcontractkit/foundations
174175
go.sum @smartcontractkit/core @smartcontractkit/foundations
175176
integration-tests/go.mod @smartcontractkit/core @smartcontractkit/devex-tooling @smartcontractkit/foundations

.github/workflows/cre-local-env-tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ jobs:
147147
148148
- name: Track local env startup success rate
149149
# track only scheduled runs to exclude failures in PRs or manual runs
150-
if: always() && github.event_name == 'workflow_call'
150+
if: always() && github.event_name == 'schedule'
151151
shell: bash
152152
env:
153153
START_CLI_OUTCOME: ${{ steps.start-cli.outcome }}
@@ -164,7 +164,7 @@ jobs:
164164
165165
- name: Track local env startup duration
166166
# track only scheduled runs to exclude failures in PRs or manual runs
167-
if: github.event_name == 'workflow_call'
167+
if: always() && github.event_name == 'schedule'
168168
shell: bash
169169
env:
170170
GETDX_SECRET_KEY: ${{ secrets.GETDX_SECRET_KEY }}

.github/workflows/cre-workflow-don-benchmark.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
permissions:
3535
contents: read
3636
id-token: write
37-
if: github.event_name == 'workflow_dispatch' || github.event_name == 'workflow_call' || (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'run-cre-workflow-don-benchmark'))
37+
if: github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' || github.event_name == 'workflow_call' || (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'run-cre-workflow-don-benchmark'))
3838
steps:
3939
- name: Checkout
4040
uses: actions/checkout@v4

.github/workflows/docker-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ jobs:
225225
call-cre-local-env-tests:
226226
if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
227227
needs: [docker-core-plugins]
228-
uses: smartcontractkit/chainlink/.github/workflows/cre-local-env-tests.yaml@d0fc90f78ed3740be3a40df1b1be0a0804fc1b91 # develop SHA from 16th June 2025
228+
uses: smartcontractkit/chainlink/.github/workflows/cre-local-env-tests.yaml@051813389f8480a4ada4606abdb260c7a59412ee # develop SHA from 18th June 2025
229229
with:
230230
chainlink_image_tag: ${{ needs.docker-core-plugins.outputs.docker-manifest-tag }}
231231
chainlink_version: ${{ github.ref_name != '' && github.ref_name || 'develop' }}
@@ -237,7 +237,7 @@ jobs:
237237
permissions:
238238
contents: read
239239
id-token: write
240-
uses: smartcontractkit/chainlink/.github/workflows/cre-workflow-don-benchmark.yaml@9092b6ad0873cb0a41df4bf65904e7eae91b4c54
240+
uses: smartcontractkit/chainlink/.github/workflows/cre-workflow-don-benchmark.yaml@051813389f8480a4ada4606abdb260c7a59412ee # develop SHA from 18th June 2025
241241
with:
242242
chainlink_image_tag: ${{ needs.docker-core-plugins-testing.outputs.docker-manifest-tag }}
243243
chainlink_version: ${{ github.ref_name != '' && github.ref_name || 'develop' }}

.golangci.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,16 @@ linters:
6060
desc: Use gopkg.in/guregu/null.v4 instead
6161
- pkg: github.com/go-gorm/gorm
6262
desc: Use github.com/jmoiron/sqlx directly instead
63+
# - pkg: github.com/smartcontractkit/chainlink-aptos
64+
# desc: Aptos only runs as a LOOPP
65+
- pkg: github.com/smartcontractkit/chainlink-cosmos
66+
desc: Cosmos only runs as a LOOPP
6367
- pkg: github.com/smartcontractkit/chainlink-integrations/evm
6468
desc: Use github.com/smartcontractkit/chainlink-evm instead
69+
- pkg: github.com/smartcontractkit/chainlink-starknet/relayer
70+
desc: Starknet only runs as a LOOPP
71+
# - pkg: github.com/smartcontractkit/chainlink-tron
72+
# desc: Tron only runs as a LOOPP
6573
- pkg: github.com/consul/sdk/freeport
6674
desc: Use github.com/smartcontractkit/freeport instead
6775
exhaustive:

core/scripts/go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ require (
3636
github.com/smartcontractkit/chain-selectors v1.0.60
3737
github.com/smartcontractkit/chainlink-automation v0.8.1
3838
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250613181244-830358e67028
39-
github.com/smartcontractkit/chainlink-common v0.7.1-0.20250617133454-9f01f00e6ea8
39+
github.com/smartcontractkit/chainlink-common v0.7.1-0.20250618162808-a5a42ee8701b
4040
github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20250604171706-a98fa6515eae
4141
github.com/smartcontractkit/chainlink-deployments-framework v0.12.1
42-
github.com/smartcontractkit/chainlink-evm v0.0.0-20250617144530-95cf323512d0
42+
github.com/smartcontractkit/chainlink-evm v0.0.0-20250618173856-d731d7e7468e
4343
github.com/smartcontractkit/chainlink-testing-framework/framework v0.9.3
4444
github.com/smartcontractkit/chainlink-testing-framework/lib v1.52.4
4545
github.com/smartcontractkit/chainlink-testing-framework/seth v1.51.0
@@ -393,12 +393,12 @@ require (
393393
github.com/sigurn/crc16 v0.0.0-20211026045750-20ab5afb07e3 // indirect
394394
github.com/sirupsen/logrus v1.9.3 // indirect
395395
github.com/smartcontractkit/ccip-owner-contracts v0.1.0 // indirect
396-
github.com/smartcontractkit/chainlink-aptos v0.0.0-20250617102748-892224d67dd1 // indirect
396+
github.com/smartcontractkit/chainlink-aptos v0.0.0-20250618082928-9aa8eff952f6 // indirect
397397
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250609091505-5c8cd74b92ed // indirect
398398
github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 // indirect
399-
github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20250617144336-d9481ebbe20e // indirect
399+
github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20250618164021-9b34289a9502 // indirect
400400
github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20250616180023-87b70c08d7c0 // indirect
401-
github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250522110034-65c54665034a // indirect
401+
github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250618135814-7e3f79ab707e // indirect
402402
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250522110034-65c54665034a // indirect
403403
github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20250612182447-1c32d2efe48f // indirect
404404
github.com/smartcontractkit/chainlink-protos/job-distributor v0.11.0 // indirect

core/scripts/go.sum

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1269,32 +1269,32 @@ github.com/smartcontractkit/ccip-owner-contracts v0.1.0 h1:GiBDtlx7539o7AKlDV+9L
12691269
github.com/smartcontractkit/ccip-owner-contracts v0.1.0/go.mod h1:NnT6w4Kj42OFFXhSx99LvJZWPpMjmo4+CpDEWfw61xY=
12701270
github.com/smartcontractkit/chain-selectors v1.0.60 h1:X/5CcVB5izIaMrGRdl0hc6sSbKSBFhYRKqo1C/JmgFs=
12711271
github.com/smartcontractkit/chain-selectors v1.0.60/go.mod h1:xsKM0aN3YGcQKTPRPDDtPx2l4mlTN1Djmg0VVXV40b8=
1272-
github.com/smartcontractkit/chainlink-aptos v0.0.0-20250617102748-892224d67dd1 h1:wOBiJx/V7e3mcuO7sSnUobf9reu+1vfzBHjGg0GWR3A=
1273-
github.com/smartcontractkit/chainlink-aptos v0.0.0-20250617102748-892224d67dd1/go.mod h1:+LMKso9gI5B78xdk3uP69/WrsJTcalbKFO63amJexsE=
1272+
github.com/smartcontractkit/chainlink-aptos v0.0.0-20250618082928-9aa8eff952f6 h1:9AytLlQiUzb+2/1xgyKwjSaYmOUBLHfG0QusDGadJuc=
1273+
github.com/smartcontractkit/chainlink-aptos v0.0.0-20250618082928-9aa8eff952f6/go.mod h1:+LMKso9gI5B78xdk3uP69/WrsJTcalbKFO63amJexsE=
12741274
github.com/smartcontractkit/chainlink-automation v0.8.1 h1:sTc9LKpBvcKPc1JDYAmgBc2xpDKBco/Q4h4ydl6+UUU=
12751275
github.com/smartcontractkit/chainlink-automation v0.8.1/go.mod h1:Iij36PvWZ6blrdC5A/nrQUBuf3MH3JvsBB9sSyc9W08=
12761276
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250613181244-830358e67028 h1:v7z9VYtymKvKDNC769qdZNvEMlNTmJy+T/cQx/DvEds=
12771277
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250613181244-830358e67028/go.mod h1:uhUQUnJA5DkBtJ/0SuBJwD+DuwiK+kRBTyz9IlSY1k0=
12781278
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250609091505-5c8cd74b92ed h1:rjtXQLTCLa/+AmMwMTP5WwJUdPBeBAF3Ivwc1GXetBw=
12791279
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250609091505-5c8cd74b92ed/go.mod h1:k3/Z6AvwurPUlfuDFEonRbkkiTSgNSrtVNhJEWNlUZA=
1280-
github.com/smartcontractkit/chainlink-common v0.7.1-0.20250617133454-9f01f00e6ea8 h1:b9g3M6Re82Kf82eXWL6OafKzQ/DmGt479zrSvdpVRMM=
1281-
github.com/smartcontractkit/chainlink-common v0.7.1-0.20250617133454-9f01f00e6ea8/go.mod h1:1ntZ0rtQpPx6h+xlcOJp0ccqHFaxTzW2Z62FJG358q0=
1280+
github.com/smartcontractkit/chainlink-common v0.7.1-0.20250618162808-a5a42ee8701b h1:nS5njF5W9lY1LnTITt3V2M35dT19JPpuVg6//vlzFiU=
1281+
github.com/smartcontractkit/chainlink-common v0.7.1-0.20250618162808-a5a42ee8701b/go.mod h1:1ntZ0rtQpPx6h+xlcOJp0ccqHFaxTzW2Z62FJG358q0=
12821282
github.com/smartcontractkit/chainlink-common/pkg/monitoring v0.0.0-20250415235644-8703639403c7 h1:9wh1G+WbXwPVqf0cfSRSgwIcaXTQgvYezylEAfwmrbw=
12831283
github.com/smartcontractkit/chainlink-common/pkg/monitoring v0.0.0-20250415235644-8703639403c7/go.mod h1:yaDOAZF6MNB+NGYpxGCUc+owIdKrjvFW0JODdTcQ3V0=
12841284
github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20250604171706-a98fa6515eae h1:BmqiIDbA9FB/uOCOHi/shgL7P0XmjFxhfRtJHdKPLE4=
12851285
github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20250604171706-a98fa6515eae/go.mod h1:2MggrMtbhqr0u4U2pcYa21lvAtvaeSawjxdIy1ytHWE=
12861286
github.com/smartcontractkit/chainlink-deployments-framework v0.12.1 h1:YRuzDFIbIW2zGVqzid+PhTit6dmNaexLCfv76Aney3k=
12871287
github.com/smartcontractkit/chainlink-deployments-framework v0.12.1/go.mod h1:mxiSmxY5dy94jZ1j9ciu9tzdVKNjo57dYTVecbwYktg=
1288-
github.com/smartcontractkit/chainlink-evm v0.0.0-20250617144530-95cf323512d0 h1:0z5RKJwEuIvW2fG0n+mdjm71zETdN7kInyWMIe71AHY=
1289-
github.com/smartcontractkit/chainlink-evm v0.0.0-20250617144530-95cf323512d0/go.mod h1:t5JyF7TxSWCpKH+Mk0lm4Byzglh9eGOPKAfn01HY9Y4=
1288+
github.com/smartcontractkit/chainlink-evm v0.0.0-20250618173856-d731d7e7468e h1:QBua0Vz42fC3nwzGnaAcUwTp+EnJp5sqiUDjud1UnwE=
1289+
github.com/smartcontractkit/chainlink-evm v0.0.0-20250618173856-d731d7e7468e/go.mod h1:GlSY0cLuXOdaZP8+7pQTezPUwJBW+ExMb5CGby4GGSU=
12901290
github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 h1:8u9xUrC+yHrTDexOKDd+jrA6LCzFFHeX1G82oj2fsSI=
12911291
github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135/go.mod h1:NkvE4iQgiT7dMCP6U3xPELHhWhN5Xr6rHC0axRebyMU=
1292-
github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20250617144336-d9481ebbe20e h1:XlelWyRv2sC65yNWM+EhqPY+jT+Nzy+zbC4Buua6N+s=
1293-
github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20250617144336-d9481ebbe20e/go.mod h1:VnW3saDDwJNCIjYrcLNNlC2M9Tt478f0rt4lHJVCnUE=
1292+
github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20250618164021-9b34289a9502 h1:WLgEB8/lIfA1vI+7O4RE/PYitO57TRkKUqVllDIgJD4=
1293+
github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20250618164021-9b34289a9502/go.mod h1:Kb8f+wt2YmBdD0PfbsC9bDhdUG/Y8sqUkzAvC2Dn8/M=
12941294
github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20250616180023-87b70c08d7c0 h1:OpFlG2f+LXsDp3cejSQju2rmoNsxBlhgrwXMIsk72IA=
12951295
github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20250616180023-87b70c08d7c0/go.mod h1:X+a4k2a+2G2/yeAaRQMCTLmlhNdQYAeN6v+ZpLzRZww=
1296-
github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250522110034-65c54665034a h1:bFYBcW0cmhq0G8NSjPxSFfL/fVODuhEGluyWOxJTqqk=
1297-
github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250522110034-65c54665034a/go.mod h1:jo+cUqNcHwN8IF7SInQNXDZ8qzBsyMpnLdYbDswviFc=
1296+
github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250618135814-7e3f79ab707e h1:LRT+PltY99+hxZAJn+4nyTfqGVNEM1S6FJ675B9BtJo=
1297+
github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250618135814-7e3f79ab707e/go.mod h1:jo+cUqNcHwN8IF7SInQNXDZ8qzBsyMpnLdYbDswviFc=
12981298
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250522110034-65c54665034a h1:O28vgyHM7QF1YLg1BwkQSIbOYA+t0RiH9+b+k90GPG8=
12991299
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250522110034-65c54665034a/go.mod h1:zYqPBBRUXUQ/L+aD4Q7phnYsfVeC5rDBXtPt1VYwtws=
13001300
github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20250612182447-1c32d2efe48f h1:OYOifWMKVL54uM+sxrY7oPVTZptTXK45tA8dXN5nZSE=

core/services/relay/evm/write_target.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ import (
66
"context"
77
"encoding/hex"
88
"encoding/json"
9+
"errors"
910
"fmt"
1011
"regexp"
1112
"strconv"
1213
"strings"
1314

1415
"github.com/ethereum/go-ethereum/common"
15-
"github.com/pkg/errors"
1616

1717
chainselectors "github.com/smartcontractkit/chain-selectors"
1818

core/services/workflows/test/wasm/v2/cmd/with_config/main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ func CreateWorkflow(wcx *sdk.WorkflowContext[*runtimeConfig]) (sdk.Workflow[*run
2828
}
2929

3030
func onTrigger(wcx *sdk.WorkflowContext[*runtimeConfig], _ sdk.Runtime, _ *basictrigger.Outputs) (string, error) {
31+
wcx.Logger.Info("onTrigger called")
3132
b, err := yaml.Marshal(wcx.Config)
3233
if err != nil {
3334
return "", err

core/services/workflows/v2/engine_test.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ func TestEngine_CapabilityCallTimeout(t *testing.T) {
517517
require.NoError(t, engine.Close())
518518
}
519519

520-
func TestEngine_MockCapabilityRegistry_NoDAGBinary(t *testing.T) {
520+
func TestEngine_WASMBinary_Simple(t *testing.T) {
521521
cmd := "core/services/workflows/test/wasm/v2/cmd"
522522
log := logger.TestLogger(t)
523523
binaryB := wasmtest.CreateTestBinary(cmd, false, t)
@@ -610,17 +610,17 @@ func TestEngine_MockCapabilityRegistry_NoDAGBinary(t *testing.T) {
610610
})
611611
}
612612

613-
func TestEngine_Config_MockCapabilityRegistry_NoDAGBinary(t *testing.T) {
613+
func TestEngine_WASMBinary_With_Config(t *testing.T) {
614614
cmd := "core/services/workflows/test/wasm/v2/cmd/with_config"
615-
log := logger.TestLogger(t)
616615
binaryB := wasmtest.CreateTestBinary(cmd, false, t)
617616

618617
// Define a custom config to validate against
619618
giveName := "Foo"
620619
giveNum := int32(42)
621620
config := fmt.Appendf(nil, "name: %s\nnumber: %d\n", giveName, giveNum)
621+
wasmLogger := logger.NewMockLogger(t)
622622
module, err := host.NewModule(&host.ModuleConfig{
623-
Logger: log,
623+
Logger: wasmLogger,
624624
IsUncompressed: true,
625625
}, binaryB)
626626
require.NoError(t, err)
@@ -675,6 +675,10 @@ func TestEngine_Config_MockCapabilityRegistry_NoDAGBinary(t *testing.T) {
675675
Return(wrappedTriggerMock, nil).
676676
Once()
677677

678+
wasmLogger.EXPECT().Info(mock.Anything).Run(func(args ...interface{}) {
679+
require.Contains(t, args[0].(string), "onTrigger called")
680+
}).Return().Once()
681+
678682
require.NoError(t, engine.Start(t.Context()))
679683
require.NoError(t, <-initDoneCh)
680684
require.Equal(t, []string{wrappedTriggerMock.ID()}, <-subscribedToTriggersCh)

0 commit comments

Comments
 (0)