Skip to content

cre-4340: diskmonitor from common #22468

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
mchain0 merged 2 commits into from
May 14, 2026
Merged

cre-4340: diskmonitor from common #22468

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
709bb5f
cre-4340: diskmonitor from common
mchain0 May 14, 2026
0817fb4
cre-4340: common bump
mchain0 May 14, 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
8 changes: 4 additions & 4 deletions core/scripts/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ require (
github.com/smartcontractkit/chain-selectors v1.0.100
github.com/smartcontractkit/chainlink-automation v0.8.1
github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20260506144252-c100eabfda74
github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511200925-b94130438417
github.com/smartcontractkit/chainlink-common v0.11.2-0.20260514144456-29b2f52c4fcf
github.com/smartcontractkit/chainlink-common/keystore v1.1.0
github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260512145107-b41c0e2855ec
github.com/smartcontractkit/chainlink-deployments-framework v0.101.1
github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260512150409-b4068bf735e6
github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20260421142741-9c7fbaf7c828
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260505131349-78e491b80735
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260514104516-a827acdffe43
github.com/smartcontractkit/chainlink-protos/job-distributor v0.18.0
github.com/smartcontractkit/chainlink-testing-framework/framework v0.16.1
github.com/smartcontractkit/chainlink-testing-framework/framework/components/dockercompose v0.1.23
Expand Down Expand Up @@ -526,8 +526,8 @@ require (
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
github.com/spf13/afero v1.15.0 // indirect
github.com/spf13/cast v1.10.0 // indirect
github.com/stellar/go-stellar-sdk v0.1.0 // indirect
github.com/stellar/go-xdr v0.0.0-20231122183749-b53fb00bcac2 // indirect
github.com/stellar/go-stellar-sdk v0.5.0 // indirect
github.com/stellar/go-xdr v0.0.0-20260312225820-cc2b0611aabf // indirect
github.com/stephenlacy/go-ethereum-hdwallet v0.0.0-20230913225845-a4fa94429863 // indirect
github.com/streamingfast/logging v0.0.0-20230608130331-f22c91403091 // indirect
github.com/stretchr/objx v0.5.3 // indirect
Expand Down
16 changes: 8 additions & 8 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.

18 changes: 13 additions & 5 deletions core/services/ocr2/delegate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ import (
"github.com/smartcontractkit/chainlink-common/keystore/corekeys"
"github.com/smartcontractkit/chainlink-common/pkg/capabilities/consensus/requests"
capabilitiespb "github.com/smartcontractkit/chainlink-common/pkg/capabilities/pb"
"github.com/smartcontractkit/chainlink-common/pkg/diskmonitor"
"github.com/smartcontractkit/chainlink-common/pkg/loop"
"github.com/smartcontractkit/chainlink-common/pkg/loop/reportingplugins"
"github.com/smartcontractkit/chainlink-common/pkg/loop/reportingplugins/ocr3"
Expand Down Expand Up @@ -101,10 +102,12 @@ import (
)

const (
vaultCapabilityID = "vault@1.0.0"
vaultOCRConfigKey = "vault"
dkgOCRConfigKey = "dkg"
dontimeCapabilityID = "dontime@1.0.0"
vaultCapabilityID = "vault@1.0.0"
vaultOCRConfigKey = "vault"
dkgOCRConfigKey = "dkg"
dontimeCapabilityID = "dontime@1.0.0"
gaugeVaultDiskUsageBytes = "platform_vault_disk_usage_bytes"
vaultDiskMonitorTickInterval = time.Minute
)

type JobSpecNoRelayerError struct {
Expand Down Expand Up @@ -726,7 +729,12 @@ func (d *Delegate) newServicesVaultPlugin(
})
srvs = append(srvs, ocrLogger)

dm, err := vaultocrplugin.NewDiskMonitor(lggr, d.cfg.OCR2().KeyValueStoreRootDir())
dm, err := diskmonitor.NewDiskMonitor(
lggr,
d.cfg.OCR2().KeyValueStoreRootDir(),
gaugeVaultDiskUsageBytes,
vaultDiskMonitorTickInterval,
)
if err != nil {
return nil, fmt.Errorf("failed to instantiate vault plugin: failed to create disk monitor: %w", err)
}
Expand Down
82 changes: 0 additions & 82 deletions core/services/ocr2/plugins/vault/disk_monitor.go
View file
Open in desktop

This file was deleted.

55 changes: 0 additions & 55 deletions core/services/ocr2/plugins/vault/disk_monitor_test.go
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions deployment/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ require (
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260415165642-49f23e4d76cc
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260511195239-0f6e1b177fc7
github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260504204047-af9826978b72
github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511200925-b94130438417
github.com/smartcontractkit/chainlink-common v0.11.2-0.20260514144456-29b2f52c4fcf
github.com/smartcontractkit/chainlink-common/keystore v1.1.0
github.com/smartcontractkit/chainlink-deployments-framework v0.101.1
github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260512150409-b4068bf735e6
github.com/smartcontractkit/chainlink-evm/contracts/cre/gobindings v0.0.0-20260403151002-2c91155b5501
github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20260421142741-9c7fbaf7c828
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260505131349-78e491b80735
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260514104516-a827acdffe43
github.com/smartcontractkit/chainlink-protos/job-distributor v0.18.0
github.com/smartcontractkit/chainlink-protos/orchestrator v0.10.0
github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260513123719-d347eaf314e1
Expand Down Expand Up @@ -448,8 +448,8 @@ require (
github.com/spf13/afero v1.15.0 // indirect
github.com/spf13/pflag v1.0.10 // indirect
github.com/spf13/viper v1.21.0 // indirect
github.com/stellar/go-stellar-sdk v0.1.0 // indirect
github.com/stellar/go-xdr v0.0.0-20231122183749-b53fb00bcac2 // indirect
github.com/stellar/go-stellar-sdk v0.5.0 // indirect
github.com/stellar/go-xdr v0.0.0-20260312225820-cc2b0611aabf // indirect
github.com/stephenlacy/go-ethereum-hdwallet v0.0.0-20230913225845-a4fa94429863 // indirect
github.com/streamingfast/logging v0.0.0-20230608130331-f22c91403091 // indirect
github.com/stretchr/objx v0.5.3 // indirect
Expand Down
16 changes: 8 additions & 8 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.

Loading
Loading