Skip to content
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

multi-chain fixes #14077

Merged
merged 2 commits into from
Aug 9, 2024
Merged

multi-chain fixes #14077

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
eb31a4c
ocr2: Shouldn't require "publicKey" under the multi-chain codepath
archseer Jul 24, 2024
5cbba6e
ocr2: Use parent ocrKeyBundleID for publicKey when using multi-chain
archseer Jul 25, 2024
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
4 changes: 0 additions & 4 deletions core/scripts/keystone/src/__snapshots__/88_gen_jobspecs_test.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ telemetryType = "plugin"
[onchainSigningStrategy]
strategyName = 'single-chain'
[onchainSigningStrategy.config]
publicKey = '8fa807463ad73f9ee855cfd60ba406dcf98a2855b3dd8af613107b0f6890a707'

--------------------------------
Oracle 1:
Expand Down Expand Up @@ -69,7 +68,6 @@ telemetryType = "plugin"
[onchainSigningStrategy]
strategyName = 'single-chain'
[onchainSigningStrategy.config]
publicKey = '8fa807463ad73f9ee855cfd60ba406dcf98a2855b3dd8af613107b0f6890a707'

--------------------------------
Oracle 2:
Expand Down Expand Up @@ -99,7 +97,6 @@ telemetryType = "plugin"
[onchainSigningStrategy]
strategyName = 'single-chain'
[onchainSigningStrategy.config]
publicKey = '8fa807463ad73f9ee855cfd60ba406dcf98a2855b3dd8af613107b0f6890a707'

--------------------------------
Oracle 3:
Expand Down Expand Up @@ -129,7 +126,6 @@ telemetryType = "plugin"
[onchainSigningStrategy]
strategyName = 'single-chain'
[onchainSigningStrategy.config]
publicKey = '8fa807463ad73f9ee855cfd60ba406dcf98a2855b3dd8af613107b0f6890a707'


---
1 change: 0 additions & 1 deletion core/scripts/keystone/templates/oracle.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,3 @@ telemetryType = "plugin"
[onchainSigningStrategy]
strategyName = 'single-chain'
[onchainSigningStrategy.config]
publicKey = '8fa807463ad73f9ee855cfd60ba406dcf98a2855b3dd8af613107b0f6890a707'
2 changes: 1 addition & 1 deletion core/services/ocr2/delegate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,7 +772,7 @@ func (d *Delegate) newServicesGenericPlugin(
}
keyBundles[name] = os
}
onchainKeyringAdapter, err = ocrcommon.NewOCR3OnchainKeyringMultiChainAdapter(keyBundles, lggr)
onchainKeyringAdapter, err = ocrcommon.NewOCR3OnchainKeyringMultiChainAdapter(keyBundles, kb.PublicKey(), lggr)
if err != nil {
return nil, err
}
Expand Down
19 changes: 0 additions & 19 deletions core/services/ocr2/validate/validate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,18 +197,6 @@ func (o *OCR2OnchainSigningStrategy) IsMultiChain() bool {
return o.StrategyName == "multi-chain"
}

func (o *OCR2OnchainSigningStrategy) PublicKey() (string, error) {
pk, ok := o.Config["publicKey"]
if !ok {
return "", nil
}
pkString, ok := pk.(string)
if !ok {
return "", fmt.Errorf("expected string publicKey value, but got: %T", pk)
}
return pkString, nil
}

func (o *OCR2OnchainSigningStrategy) ConfigCopy() job.JSONConfig {
copiedConfig := make(job.JSONConfig)
for k, v := range o.Config {
Expand Down Expand Up @@ -251,13 +239,6 @@ func validateGenericPluginSpec(ctx context.Context, spec *job.OCR2OracleSpec, rc
if err != nil {
return err
}
pk, ossErr := onchainSigningStrategy.PublicKey()
if ossErr != nil {
return ossErr
}
if pk == "" {
return errors.New("generic config invalid: must provide public key for the onchain signing strategy")
}
}

plugEnv := env.NewPlugin(p.PluginName)
Expand Down
60 changes: 0 additions & 60 deletions core/services/ocr2/validate/validate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ chainID = 1337
strategyName = "single-chain"
[onchainSigningStrategy.config]
evm = ""
publicKey = "0x1234567890123456789012345678901234567890"
[pluginConfig]
juelsPerFeeCoinSource = """
ds1 [type=bridge name=voter_turnout];
Expand Down Expand Up @@ -105,7 +104,6 @@ chainID = 1337
strategyName = "single-chain"
[onchainSigningStrategy.config]
evm = ""
publicKey = "0x1234567890123456789012345678901234567890"
[pluginConfig]
juelsPerFeeCoinSource = """
ds1 [type=bridge name=voter_turnout];
Expand Down Expand Up @@ -150,7 +148,6 @@ chainID = 1337
strategyName = "single-chain"
[onchainSigningStrategy.config]
evm = ""
publicKey = "0x1234567890123456789012345678901234567890"
[pluginConfig]
`,
assertion: func(t *testing.T, os job.Job, err error) {
Expand All @@ -174,7 +171,6 @@ chainID = 1337
strategyName = "single-chain"
[onchainSigningStrategy.config]
evm = ""
publicKey = "0x1234567890123456789012345678901234567890"
[pluginConfig]
`,
assertion: func(t *testing.T, os job.Job, err error) {
Expand All @@ -200,7 +196,6 @@ chainID = 1337
strategyName = "single-chain"
[onchainSigningStrategy.config]
evm = ""
publicKey = "0x1234567890123456789012345678901234567890"
[pluginConfig]
`,
assertion: func(t *testing.T, os job.Job, err error) {
Expand All @@ -226,7 +221,6 @@ chainID = 1337
strategyName = "single-chain"
[onchainSigningStrategy.config]
evm = ""
publicKey = "0x1234567890123456789012345678901234567890"
[pluginConfig]
`,
assertion: func(t *testing.T, os job.Job, err error) {
Expand All @@ -253,7 +247,6 @@ chainID = 1337
strategyName = "single-chain"
[onchainSigningStrategy.config]
evm = ""
publicKey = "0x1234567890123456789012345678901234567890"
[pluginConfig]
`,
assertion: func(t *testing.T, os job.Job, err error) {
Expand All @@ -279,7 +272,6 @@ chainID = 1337
strategyName = "single-chain"
[onchainSigningStrategy.config]
evm = ""
publicKey = "0x1234567890123456789012345678901234567890"
[pluginConfig]
`,
assertion: func(t *testing.T, os job.Job, err error) {
Expand All @@ -303,7 +295,6 @@ chainID = 1337
strategyName = "single-chain"
[onchainSigningStrategy.config]
evm = ""
publicKey = "0x1234567890123456789012345678901234567890"
[pluginConfig]
`,
assertion: func(t *testing.T, os job.Job, err error) {
Expand Down Expand Up @@ -344,7 +335,6 @@ answer1 [type=median index=0];
strategyName = "single-chain"
[onchainSigningStrategy.config]
evm = ""
publicKey = "0x1234567890123456789012345678901234567890"
[pluginConfig]
juelsPerFeeCoinSource = """
ds1 [type=bridge name=voter_turnout];
Expand Down Expand Up @@ -383,7 +373,6 @@ answer1 [type=median index=0];
strategyName = "single-chain"
[onchainSigningStrategy.config]
evm = ""
publicKey = "0x1234567890123456789012345678901234567890"
[pluginConfig]
juelsPerFeeCoinSource = """
->
Expand Down Expand Up @@ -415,7 +404,6 @@ answer1 [type=median index=0];
strategyName = "single-chain"
[onchainSigningStrategy.config]
evm = ""
publicKey = "0x1234567890123456789012345678901234567890"
[pluginConfig]
juelsPerFeeCoinSource = """
ds1 [type=bridge name=voter_turnout];
Expand All @@ -429,46 +417,6 @@ chainID = 1337
require.Contains(t, err.Error(), "no such relay blerg supported")
},
},
{
name: "Generic public onchain signing strategy with no public key",
toml: `
type = "offchainreporting2"
pluginType = "plugin"
schemaVersion = 1
relay = "evm"
contractID = "0x613a38AC1659769640aaE063C651F48E0250454C"
p2pPeerID = "12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq"
p2pv2Bootstrappers = [
"[email protected]:5001",
]
ocrKeyBundleID = "73e8966a78ca09bb912e9565cfb79fbe8a6048fab1f0cf49b18047c3895e0447"
monitoringEndpoint = "chain.link:4321"
transmitterID = "0xF67D0290337bca0847005C7ffD1BC75BA9AAE6e4"
observationTimeout = "10s"
observationSource = """
ds1 [type=bridge name=voter_turnout];
ds1_parse [type=jsonparse path="one,two"];
ds1_multiply [type=multiply times=1.23];
ds1 -> ds1_parse -> ds1_multiply -> answer1;
answer1 [type=median index=0];
"""
[relayConfig]
chainID = 1337
[onchainSigningStrategy]
strategyName = "single-chain"
[onchainSigningStrategy.config]
evm = ""
publicKey = ""
[pluginConfig]
pluginName = "median"
telemetryType = "median"
OCRVersion=2
`,
assertion: func(t *testing.T, os job.Job, err error) {
require.Error(t, err)
require.Contains(t, err.Error(), "must provide public key for the onchain signing strategy")
},
},
{
name: "Generic plugin config validation - nothing provided",
toml: `
Expand All @@ -493,7 +441,6 @@ chainID = 4
strategyName = "single-chain"
[onchainSigningStrategy.config]
evm = ""
publicKey = "0x1234567890123456789012345678901234567890"

[pluginConfig]
`,
Expand Down Expand Up @@ -525,7 +472,6 @@ chainID = 4
strategyName = "single-chain"
[onchainSigningStrategy.config]
evm = ""
publicKey = "0x1234567890123456789012345678901234567890"

[pluginConfig]
PluginName="some random name"
Expand Down Expand Up @@ -559,7 +505,6 @@ chainID = 4
strategyName = "single-chain"
[onchainSigningStrategy.config]
evm = ""
publicKey = "0x1234567890123456789012345678901234567890"

[pluginConfig]
PluginName="some random name"
Expand Down Expand Up @@ -594,7 +539,6 @@ chainID = 4
strategyName = "single-chain"
[onchainSigningStrategy.config]
evm = ""
publicKey = "0x1234567890123456789012345678901234567890"

[pluginConfig]
PluginName="some random name"
Expand Down Expand Up @@ -712,7 +656,6 @@ func TestOCR2OnchainSigningStrategy_Unmarshal(t *testing.T) {
strategyName = "single-chain"
[onchainSigningStrategy.config]
evm = "08d14c6eed757414d72055d28de6caf06535806c6a14e450f3a2f1c854420e17"
publicKey = "0x1234567890123456789012345678901234567890"
`
oss := &envelope2{}
tree, err := toml.Load(payload)
Expand All @@ -725,12 +668,9 @@ publicKey = "0x1234567890123456789012345678901234567890"
err = json.Unmarshal(b, oss)
require.NoError(t, err)

pk, err := oss.OnchainSigningStrategy.PublicKey()
require.NoError(t, err)
kbID, err := oss.OnchainSigningStrategy.KeyBundleID("evm")
require.NoError(t, err)

assert.False(t, oss.OnchainSigningStrategy.IsMultiChain())
assert.Equal(t, "0x1234567890123456789012345678901234567890", pk)
assert.Equal(t, "08d14c6eed757414d72055d28de6caf06535806c6a14e450f3a2f1c854420e17", kbID)
}
5 changes: 2 additions & 3 deletions core/services/ocrcommon/adapters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,11 @@ type OCR3OnchainKeyringMultiChainAdapter struct {
lggr logger.Logger
}

func NewOCR3OnchainKeyringMultiChainAdapter(ost map[string]ocr2key.KeyBundle, lggr logger.Logger) (*OCR3OnchainKeyringMultiChainAdapter, error) {
func NewOCR3OnchainKeyringMultiChainAdapter(ost map[string]ocr2key.KeyBundle, publicKey ocrtypes.OnchainPublicKey, lggr logger.Logger) (*OCR3OnchainKeyringMultiChainAdapter, error) {
if len(ost) == 0 {
return nil, errors.New("no key bundles provided")
}
// We don't need to check for the existence of `publicKey` in the keyBundles map because it is required on validation on `validate/validate.go`
return &OCR3OnchainKeyringMultiChainAdapter{ost, ost["publicKey"].PublicKey(), lggr}, nil
return &OCR3OnchainKeyringMultiChainAdapter{ost, publicKey, lggr}, nil
}

func (a *OCR3OnchainKeyringMultiChainAdapter) PublicKey() ocrtypes.OnchainPublicKey {
Expand Down
4 changes: 2 additions & 2 deletions core/services/ocrcommon/adapters_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,9 @@ publicKey = "pub-key"
keyBundles[name] = os
}

adapter, err := ocrcommon.NewOCR3OnchainKeyringMultiChainAdapter(keyBundles, logger.TestLogger(t))
adapter, err := ocrcommon.NewOCR3OnchainKeyringMultiChainAdapter(keyBundles, pk, logger.TestLogger(t))
require.NoError(t, err)
_, err = ocrcommon.NewOCR3OnchainKeyringMultiChainAdapter(map[string]ocr2key.KeyBundle{}, logger.TestLogger(t))
_, err = ocrcommon.NewOCR3OnchainKeyringMultiChainAdapter(map[string]ocr2key.KeyBundle{}, pk, logger.TestLogger(t))
require.Error(t, err, "no key bundles provided")

sig, err := adapter.Sign(configDigest, seqNr, reportInfo)
Expand Down
Loading