Skip to content

[pull] develop from smartcontractkit:develop #232

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

Merged
pull merged 2 commits into from
Mar 13, 2026
Merged

[pull] develop from smartcontractkit:develop #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84d0771
increase aptos curse mcms deployment gas limit (#21511)
FelixFan1992 Mar 12, 2026
1784d6b
Logtrigger ACK System E2E Testing (#21495)
DylanTinianov Mar 12, 2026
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
2 changes: 1 addition & 1 deletion core/capabilities/remote/trigger_publisher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ func (p *triggerPublisher) Receive(_ context.Context, msg *types.MessageBody) {
ctx, cancel := p.stopCh.NewCtx()
defer cancel()
p.lggr.Debugw("ACKing trigger event", "triggerEventId", triggerEventID)
err = cfg.underlying.AckEvent(ctx, p.capabilityID, triggerEventID, p.capMethodName)
err = cfg.underlying.AckEvent(ctx, triggerID, triggerEventID, p.capMethodName)
if err != nil {
p.lggr.Errorw("failed to AckEvent on underlying trigger capability",
"eventID", triggerEventID, "capabilityID", p.capabilityID, "err", err)
Expand Down
2 changes: 1 addition & 1 deletion core/scripts/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ require (
github.com/shopspring/decimal v1.4.0
github.com/smartcontractkit/chainlink-automation v0.8.1
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20260311190822-5cbfc939dd16
github.com/smartcontractkit/chainlink-common v0.10.1-0.20260310204254-f3e84643d9cd
github.com/smartcontractkit/chainlink-common v0.10.1-0.20260312174130-8651b6078ed9
github.com/smartcontractkit/chainlink-common/keystore v1.0.2
github.com/smartcontractkit/chainlink-data-streams v0.1.12-0.20260227110503-42b236799872
github.com/smartcontractkit/chainlink-deployments-framework v0.86.0
Expand Down
4 changes: 2 additions & 2 deletions core/scripts/go.sum
View file
Open in desktop

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

1 change: 1 addition & 0 deletions deployment/ccip/changeset/aptos/operation/curse_mcms.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ func deployCurseMCMS(b operations.Bundle, deps dependency.AptosDeps, in DeployCu
"mcms": in.MCMSAddress,
"mcms_register_entrypoints": aptos.AccountOne,
},
aptos.MaxGasAmount(5_000_000),
)
if err != nil {
return aptos.AccountAddress{}, fmt.Errorf("failed to deploy CurseMCMS: %w", err)
Expand Down
2 changes: 1 addition & 1 deletion deployment/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ require (
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260224214816-cb23ec38649f
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260310183131-8d0f0e383288
github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260303213437-47af98c8ae82
github.com/smartcontractkit/chainlink-common v0.10.1-0.20260310204254-f3e84643d9cd
github.com/smartcontractkit/chainlink-common v0.10.1-0.20260312174130-8651b6078ed9
github.com/smartcontractkit/chainlink-common/keystore v1.0.2
github.com/smartcontractkit/chainlink-deployments-framework v0.86.0
github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260312040800-ae9a90cffec3
Expand Down
4 changes: 2 additions & 2 deletions deployment/go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ require (
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260224214816-cb23ec38649f
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250912190424-fd2e35d7deb5
github.com/smartcontractkit/chainlink-ccv v0.0.0-20260306124118-a6395a14f619
github.com/smartcontractkit/chainlink-common v0.10.1-0.20260310204254-f3e84643d9cd
github.com/smartcontractkit/chainlink-common v0.10.1-0.20260312174130-8651b6078ed9
github.com/smartcontractkit/chainlink-common/keystore v1.0.2
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10
github.com/smartcontractkit/chainlink-data-streams v0.1.12-0.20260227110503-42b236799872
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion integration-tests/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ require (
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20260311190822-5cbfc939dd16
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260310183131-8d0f0e383288
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260310183131-8d0f0e383288
github.com/smartcontractkit/chainlink-common v0.10.1-0.20260310204254-f3e84643d9cd
github.com/smartcontractkit/chainlink-common v0.10.1-0.20260312174130-8651b6078ed9
github.com/smartcontractkit/chainlink-common/keystore v1.0.2
github.com/smartcontractkit/chainlink-deployments-framework v0.86.0
github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260312040800-ae9a90cffec3
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion integration-tests/load/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ require (
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20260311190822-5cbfc939dd16
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260310183131-8d0f0e383288
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260310183131-8d0f0e383288
github.com/smartcontractkit/chainlink-common v0.10.1-0.20260310204254-f3e84643d9cd
github.com/smartcontractkit/chainlink-common v0.10.1-0.20260312174130-8651b6078ed9
github.com/smartcontractkit/chainlink-deployments-framework v0.86.0
github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260312040800-ae9a90cffec3
github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20251222115927-36a18321243c
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/load/go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion plugins/plugins.private.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ plugins:
installPath: "."
evm:
- moduleURI: "github.com/smartcontractkit/capabilities/chain_capabilities/evm"
gitRef: "9382dd467b74fe964497d84ac134162eac150322"
gitRef: "fb5ae42e0b1153ed284175c4cd87d80a7eb6fef5"
installPath: "."
solana:
- moduleURI: "github.com/smartcontractkit/capabilities/chain_capabilities/solana"
Expand Down
2 changes: 1 addition & 1 deletion system-tests/lib/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ require (
github.com/sethvargo/go-retry v0.3.0
github.com/smartcontractkit/chain-selectors v1.0.97
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260310183131-8d0f0e383288
github.com/smartcontractkit/chainlink-common v0.10.1-0.20260310204254-f3e84643d9cd
github.com/smartcontractkit/chainlink-common v0.10.1-0.20260312174130-8651b6078ed9
github.com/smartcontractkit/chainlink-common/keystore v1.0.2
github.com/smartcontractkit/chainlink-deployments-framework v0.86.0
github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260312040800-ae9a90cffec3
Expand Down
4 changes: 2 additions & 2 deletions system-tests/lib/go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion system-tests/tests/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ require (
github.com/rs/zerolog v1.34.0
github.com/shopspring/decimal v1.4.0
github.com/smartcontractkit/chain-selectors v1.0.97
github.com/smartcontractkit/chainlink-common v0.10.1-0.20260310204254-f3e84643d9cd
github.com/smartcontractkit/chainlink-common v0.10.1-0.20260312174130-8651b6078ed9
github.com/smartcontractkit/chainlink-common/keystore v1.0.2
github.com/smartcontractkit/chainlink-data-streams v0.1.12-0.20260227110503-42b236799872
github.com/smartcontractkit/chainlink-deployments-framework v0.86.0
Expand Down
4 changes: 2 additions & 2 deletions system-tests/tests/go.sum
View file
Open in desktop

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

Loading
Loading