diff --git a/core/scripts/go.mod b/core/scripts/go.mod index 3463e4125aa..9c4e5a869ba 100644 --- a/core/scripts/go.mod +++ b/core/scripts/go.mod @@ -26,8 +26,8 @@ require ( github.com/shopspring/decimal v1.4.0 github.com/smartcontractkit/chainlink-automation v0.8.1 github.com/smartcontractkit/chainlink-common v0.3.1-0.20241025132045-cfad02139595 + github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20241018134907-a00ba3729b5e github.com/smartcontractkit/chainlink/deployment v0.0.0-00010101000000-000000000000 - github.com/smartcontractkit/chainlink/integration-tests v0.0.0-00010101000000-000000000000 github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000 github.com/smartcontractkit/libocr v0.0.0-20241007185508-adbe57025f12 github.com/spf13/cobra v1.8.1 @@ -37,10 +37,10 @@ require ( github.com/umbracle/fastrlp v0.0.0-20220527094140-59d5dd30e722 github.com/urfave/cli v1.22.14 google.golang.org/protobuf v1.35.1 + gopkg.in/yaml.v3 v3.0.1 k8s.io/api v0.31.1 k8s.io/apimachinery v0.31.1 k8s.io/client-go v0.31.1 - k8s.io/client-go v0.31.0 ) require ( @@ -362,7 +362,7 @@ require ( go.opentelemetry.io/proto/otlp v1.3.1 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/ratelimit v0.3.1 // indirect - go.uber.org/zap v1.27.0 // indirect + go.uber.org/zap v1.27.0 golang.org/x/arch v0.11.0 // indirect golang.org/x/crypto v0.28.0 // indirect golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect diff --git a/core/scripts/keystone/src/02_provision_ocr3_capability.go b/core/scripts/keystone/src/02_provision_ocr3_capability.go index 0fc39c80c0c..b2c64ff9322 100644 --- a/core/scripts/keystone/src/02_provision_ocr3_capability.go +++ b/core/scripts/keystone/src/02_provision_ocr3_capability.go @@ -9,7 +9,9 @@ import ( "fmt" "os" - ksdeploy "github.com/smartcontractkit/chainlink/integration-tests/deployment/keystone" + "github.com/smartcontractkit/chainlink/deployment" + + ksdeploy "github.com/smartcontractkit/chainlink/deployment/keystone" helpers "github.com/smartcontractkit/chainlink/core/scripts/common" "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/keystone/generated/ocr3_capability" @@ -143,6 +145,7 @@ func deployOCR3Contract( func generateOCR3Config(nodeSet NodeSet, configFile string, chainID int64) ksdeploy.Orc2drOracleConfig { topLevelCfg := mustReadOCR3Config(configFile) cfg := topLevelCfg.OracleConfig + cfg.OCRSecrets = deployment.XXXGenerateTestOCRSecrets() c, err := ksdeploy.GenerateOCR3Config(cfg, nodeKeysToKsDeployNodeKeys(nodeSet.NodeKeys[1:])) // skip the bootstrap node helpers.PanicErr(err) return c diff --git a/core/scripts/keystone/src/02_provision_streams_trigger_capability.go b/core/scripts/keystone/src/02_provision_streams_trigger_capability.go index e0c37bb1359..c9b22d94e16 100644 --- a/core/scripts/keystone/src/02_provision_streams_trigger_capability.go +++ b/core/scripts/keystone/src/02_provision_streams_trigger_capability.go @@ -40,6 +40,7 @@ import ( datastreamsmercury "github.com/smartcontractkit/chainlink-data-streams/mercury" helpers "github.com/smartcontractkit/chainlink/core/scripts/common" + "github.com/smartcontractkit/chainlink/deployment" "github.com/smartcontractkit/chainlink/v2/core/bridges" "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm" "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury" @@ -522,8 +523,11 @@ func generateMercuryOCR2Config(nca []NodeKeys) MercuryOCR2Config { }) } + secrets := deployment.XXXGenerateTestOCRSecrets() // Values were taken from Data Streams 250ms feeds, given by @austinborn - signers, _, _, onchainConfig, offchainConfigVersion, offchainConfig, err := ocr3confighelper.ContractSetConfigArgsForTestsMercuryV02( + signers, _, _, onchainConfig, offchainConfigVersion, offchainConfig, err := ocr3confighelper.ContractSetConfigArgsDeterministic( + secrets.EphemeralSk, + secrets.SharedSecret, 10*time.Second, // DeltaProgress 10*time.Second, // DeltaResend 400*time.Millisecond, // DeltaInitial @@ -535,9 +539,12 @@ func generateMercuryOCR2Config(nca []NodeKeys) MercuryOCR2Config { []int{len(identities)}, // S identities, reportingPluginConfig, // reportingPluginConfig []byte, - nil, - 250*time.Millisecond, // Max duration observation - int(f), // f + nil, // maxDurationInitialization *time.Duration, + 0, // maxDurationQuery time.Duration, + 250*time.Millisecond, // Max duration observation + 0, // Max duration should accept attested report + 0, // Max duration should transmit accepted report + int(f), // f onchainConfig, ) signerAddresses, err := evm.OnchainPublicKeyToAddress(signers) diff --git a/core/scripts/keystone/src/88_ocr_helpers.go b/core/scripts/keystone/src/88_ocr_helpers.go index 369c4e81c4c..e4889b952ef 100644 --- a/core/scripts/keystone/src/88_ocr_helpers.go +++ b/core/scripts/keystone/src/88_ocr_helpers.go @@ -4,7 +4,7 @@ import ( "encoding/hex" "github.com/ethereum/go-ethereum/common" - ksdeploy "github.com/smartcontractkit/chainlink/integration-tests/deployment/keystone" + ksdeploy "github.com/smartcontractkit/chainlink/deployment/keystone" "github.com/smartcontractkit/libocr/offchainreporting2/types" )