CCIP-3920 Enabling fee boosting

execute/factory.go

@@ -137,7 +137,7 @@ func (p PluginFactory) NewReportingPlugin(
 
 	costlyMessageObserver := exectypes.NewCostlyMessageObserverWithDefaults(
 		p.lggr,
-		false, // TODO: enable
+		true,
 		ccipReader,
 		offchainConfig.RelativeBoostPerWaitHour,
 		p.estimateProvider,

pkg/reader/ccip.go

@@ -278,6 +278,56 @@ func (r *ccipChainReader) ExecutedMessageRanges(
 	return executed, nil
 }
 
+// Temporary struct to properly deserialize cciptypes.Message before we have support for cciptypes.BigInt
+type ccipMessageTokenAmount struct {
+	SourcePoolAddress cciptypes.UnknownAddress
+	DestTokenAddress  cciptypes.UnknownAddress
+	ExtraData         cciptypes.Bytes
+	Amount            *big.Int
+	DestExecData      cciptypes.Bytes
+}
+
+func (t *ccipMessageTokenAmount) ToOnRampToken() cciptypes.RampTokenAmount {
+	return cciptypes.RampTokenAmount{
+		SourcePoolAddress: t.SourcePoolAddress,
+		DestTokenAddress:  t.DestTokenAddress,
+		ExtraData:         t.ExtraData,
+		Amount:            cciptypes.NewBigInt(t.Amount),
+		DestExecData:      t.DestExecData,
+	}
+}
+
+type ccipMessage struct {
+	Header         cciptypes.RampMessageHeader
+	Sender         cciptypes.UnknownAddress
+	Data           cciptypes.Bytes
+	Receiver       cciptypes.UnknownAddress
+	ExtraArgs      cciptypes.Bytes
+	FeeToken       cciptypes.UnknownAddress
+	FeeTokenAmount *big.Int
+	FeeValueJuels  *big.Int
+	TokenAmounts   []ccipMessageTokenAmount
+}
+
+func (m *ccipMessage) ToMessage() cciptypes.Message {
+	tk := make([]cciptypes.RampTokenAmount, len(m.TokenAmounts))
+	for i := range m.TokenAmounts {
+		tk[i] = m.TokenAmounts[i].ToOnRampToken()
+	}
+
+	return cciptypes.Message{
+		Header:         m.Header,
+		Sender:         m.Sender,
+		Data:           m.Data,
+		Receiver:       m.Receiver,
+		ExtraArgs:      m.ExtraArgs,
+		FeeToken:       m.FeeToken,
+		FeeTokenAmount: cciptypes.NewBigInt(m.FeeTokenAmount),
+		FeeValueJuels:  cciptypes.NewBigInt(m.FeeValueJuels),
+		TokenAmounts:   tk,
+	}
+}
+
 func (r *ccipChainReader) MsgsBetweenSeqNums(
 	ctx context.Context, sourceChainSelector cciptypes.ChainSelector, seqNumRange cciptypes.SeqNumRange,
 ) ([]cciptypes.Message, error) {
@@ -292,7 +342,7 @@ func (r *ccipChainReader) MsgsBetweenSeqNums(
 
 	type SendRequestedEvent struct {
 		DestChainSelector cciptypes.ChainSelector
-		Message           cciptypes.Message
+		Message           ccipMessage
 	}
 
 	seq, err := r.contractReaders[sourceChainSelector].ExtendedQueryKey(
@@ -337,7 +387,7 @@ func (r *ccipChainReader) MsgsBetweenSeqNums(
 		msg.Message.Header.OnRamp = onRampAddress
 
 		if valid {
-			msgs = append(msgs, msg.Message)
+			msgs = append(msgs, msg.Message.ToMessage())
 		}
 	}