with timeout

Author: graham-chainlink

engine/cld/mcms/proposalanalysis/analyzer_context.go

@@ -2,7 +2,6 @@ package proposalanalysis
 
 import (
 	"github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/mcms/proposalanalysis/types"
-	experimentalanalyzer "github.com/smartcontractkit/chainlink-deployments-framework/experimental/analyzer"
 )
 
 var _ types.AnalyzerContext = &analyzerContext{}
@@ -11,8 +10,6 @@ type analyzerContext struct {
 	proposal       types.AnalyzedProposal
 	batchOperation types.AnalyzedBatchOperation
 	call           types.AnalyzedCall
-	evmRegistry    experimentalanalyzer.EVMABIRegistry
-	solanaRegistry experimentalanalyzer.SolanaDecoderRegistry
 }
 
 func (ac *analyzerContext) Proposal() types.AnalyzedProposal {
@@ -27,14 +24,6 @@ func (ac *analyzerContext) Call() types.AnalyzedCall {
 	return ac.call
 }
 
-func (ac *analyzerContext) GetEVMRegistry() experimentalanalyzer.EVMABIRegistry {
-	return ac.evmRegistry
-}
-
-func (ac *analyzerContext) GetSolanaRegistry() experimentalanalyzer.SolanaDecoderRegistry {
-	return ac.solanaRegistry
-}
-
 // GetAnnotationsFrom returns annotations from a specific analyzer
 func (ac *analyzerContext) GetAnnotationsFrom(analyzerID string) types.Annotations {
 	var annotations types.Annotations

engine/cld/mcms/proposalanalysis/decoder/decoder.go

@@ -18,12 +18,14 @@ type ProposalDecoder interface {
 
 // legacyDecoder adapts the legacy experimental/analyzer package to the new decoder interface
 type legacyDecoder struct {
-	proposalContext experimentalanalyzer.ProposalContext
+	evmABIMappings map[string]string
+	solanaDecoders map[string]experimentalanalyzer.DecodeInstructionFn
 }
 
 // NewLegacyDecoder creates a decoder that wraps legacy experimental/analyzer decoding logic.
 // Use functional options to configure:
-//   - WithProposalContext: provide a custom ProposalContext (otherwise default is created)
+//   - WithEVMABIMappings: override proposal context EVM ABI mappings
+//   - WithSolanaDecoders: override proposal context Solana decoder mappings
 func NewLegacyDecoder(opts ...DecoderOption) ProposalDecoder {
 	decoder := &legacyDecoder{}
 
@@ -37,11 +39,17 @@ func NewLegacyDecoder(opts ...DecoderOption) ProposalDecoder {
 // DecoderOption is a functional option for configuring the decoder
 type DecoderOption func(*legacyDecoder)
 
-// WithProposalContext injects a custom ProposalContext for decoding.
-// If not provided, a default context will be created during decoding.
-func WithProposalContext(ctx experimentalanalyzer.ProposalContext) DecoderOption {
+// WithEVMABIMappings overrides the proposal context EVM ABI mappings used during decoding.
+func WithEVMABIMappings(mappings map[string]string) DecoderOption {
 	return func(d *legacyDecoder) {
-		d.proposalContext = ctx
+		d.evmABIMappings = mappings
+	}
+}
+
+// WithSolanaDecoders overrides the proposal context Solana decoder mappings used during decoding.
+func WithSolanaDecoders(decoders map[string]experimentalanalyzer.DecodeInstructionFn) DecoderOption {
+	return func(d *legacyDecoder) {
+		d.solanaDecoders = decoders
 	}
 }
 
@@ -50,18 +58,12 @@ func (d *legacyDecoder) Decode(
 	env deployment.Environment,
 	proposal *mcms.TimelockProposal,
 ) (types.DecodedTimelockProposal, error) {
-	// Create proposal context for legacy experimental analyzer
-	// Use the provided context if available, otherwise create a default one
-	var proposalCtx experimentalanalyzer.ProposalContext
-
-	if d.proposalContext != nil {
-		proposalCtx = d.proposalContext
-	} else {
-		var err error
-		proposalCtx, err = experimentalanalyzer.NewDefaultProposalContext(env)
-		if err != nil {
-			return nil, fmt.Errorf("failed to create proposal context: %w", err)
-		}
+	proposalCtx, err := experimentalanalyzer.NewDefaultProposalContext(env,
+		experimentalanalyzer.WithEVMABIMappings(d.evmABIMappings),
+		experimentalanalyzer.WithSolanaDecoders(d.solanaDecoders),
+	)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create proposal context: %w", err)
 	}
 
 	// Build the report using legacy experimental analyzer

engine/cld/mcms/proposalanalysis/decoder/decoder_test.go

@@ -4,7 +4,6 @@ import (
 	"testing"
 
 	"github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/mcms/proposalanalysis/decoder"
-	experimentalanalyzer "github.com/smartcontractkit/chainlink-deployments-framework/experimental/analyzer"
 	"github.com/stretchr/testify/require"
 )
 
@@ -15,35 +14,11 @@ func TestDecoderOptions(t *testing.T) {
 		require.NotNil(t, d)
 	})
 
-	t.Run("can inject custom proposal context", func(t *testing.T) {
-		customContext := &mockProposalContext{}
-
+	t.Run("can configure registry options", func(t *testing.T) {
 		d := decoder.NewLegacyDecoder(
-			decoder.WithProposalContext(customContext),
+			decoder.WithEVMABIMappings(nil),
+			decoder.WithSolanaDecoders(nil),
 		)
 		require.NotNil(t, d)
 	})
 }
-
-// mockProposalContext is a minimal mock for testing
-type mockProposalContext struct{}
-
-func (m *mockProposalContext) GetEVMRegistry() experimentalanalyzer.EVMABIRegistry {
-	return nil
-}
-
-func (m *mockProposalContext) GetSolanaDecoderRegistry() experimentalanalyzer.SolanaDecoderRegistry {
-	return nil
-}
-
-func (m *mockProposalContext) FieldsContext(chainSelector uint64) *experimentalanalyzer.FieldContext {
-	return nil
-}
-
-func (m *mockProposalContext) GetRenderer() experimentalanalyzer.Renderer {
-	return nil
-}
-
-func (m *mockProposalContext) SetRenderer(renderer experimentalanalyzer.Renderer) {
-	// no-op
-}

engine/cld/mcms/proposalanalysis/decoder/legacy_adapter.go

@@ -73,6 +73,16 @@ func (d *decodedCall) AdditionalFields() json.RawMessage {
 	return json.RawMessage("{}")
 }
 
+func (d *decodedCall) ContractType() string {
+	// return d.call.ContractType
+	return ""
+}
+
+func (d *decodedCall) ContractVersion() string {
+	// return d.call.ContractVersion
+	return ""
+}
+
 // decodedParameter adapts legacy experimental named field
 type decodedParameter struct {
 	field experimentalanalyzer.NamedField
@@ -86,6 +96,11 @@ func (d *decodedParameter) Value() any {
 	return convertFieldValue(d.field.Value)
 }
 
+func (d *decodedParameter) Type() string {
+	// return d.field.Type
+	return ""
+}
+
 // convertNamedFields converts legacy experimental NamedFields to DecodedParameters
 func convertNamedFields(fields []experimentalanalyzer.NamedField) types.DecodedParameters {
 	params := make(types.DecodedParameters, len(fields))