diff --git a/core/capabilities/launcher.go b/core/capabilities/launcher.go index f2bfd5e4b16..c98e95c8637 100644 --- a/core/capabilities/launcher.go +++ b/core/capabilities/launcher.go @@ -10,15 +10,14 @@ import ( "google.golang.org/protobuf/proto" - "github.com/smartcontractkit/chainlink-common/pkg/capabilities" - "github.com/smartcontractkit/chainlink-common/pkg/capabilities/triggers" - "github.com/smartcontractkit/chainlink-common/pkg/services" - "github.com/smartcontractkit/chainlink-common/pkg/values" - "github.com/smartcontractkit/libocr/ragep2p" ragetypes "github.com/smartcontractkit/libocr/ragep2p/types" + "github.com/smartcontractkit/chainlink-common/pkg/capabilities" capabilitiespb "github.com/smartcontractkit/chainlink-common/pkg/capabilities/pb" + "github.com/smartcontractkit/chainlink-common/pkg/capabilities/triggers" + "github.com/smartcontractkit/chainlink-common/pkg/services" + "github.com/smartcontractkit/chainlink-common/pkg/values" "github.com/smartcontractkit/chainlink/v2/core/capabilities/remote" "github.com/smartcontractkit/chainlink/v2/core/capabilities/remote/target" remotetypes "github.com/smartcontractkit/chainlink/v2/core/capabilities/remote/types" @@ -264,12 +263,17 @@ func (w *launcher) addRemoteCapabilities(ctx context.Context, myDON registrysync return nil, err } - aggregator := triggers.NewMercuryRemoteAggregator( - codec, - signers, - int(remoteDON.F+1), - w.lggr, - ) + var aggregator remotetypes.Aggregator + if strings.HasPrefix(info.ID, "streams-trigger") { + aggregator = triggers.NewMercuryRemoteAggregator( + codec, + signers, + int(remoteDON.F+1), + w.lggr, + ) + } else { + aggregator = remote.NewDefaultModeAggregator(2*uint32(remoteDON.F) + 1) + } // TODO: We need to implement a custom, Mercury-specific // aggregator here, because there is no guarantee that