Add feeToken & tokenAmountBeforeTokenPoolFees to CCIPMessageSentEvent

contracts/ccip/core/daml/CCIP/CoreV1/SendingMessage.daml

@@ -230,6 +230,9 @@ template SendingMessage
         networkFeeUSDCents : Numeric 0
         -- Expected token instrument for outbound TAR validation
         expectedTokenInstrumentId : Optional Splice.Api.Token.HoldingV1.InstrumentId
+        -- The original input amount of the message, before the pool deducts any fees.
+        -- Emitted in the CCIPMessageSent event
+        tokenAmountBeforeTokenPoolFees : Decimal
         -- Pool-required outbound CCVs, set via TAR authorization
         outboundPoolCCVs : Optional [Chainlink.InstanceAddress.RawInstanceAddress]
         -- Executor arguments, set during PrepareSend and validated by AddExecutorFee.
@@ -630,6 +633,8 @@ template SendingMessage
                         destChainSelector = destChainSelector
                         sequenceNumber = sequenceNumber
                         messageId = messageId
+                        feeToken = feeToken
+                        tokenAmountBeforeTokenPoolFees = tokenAmountBeforeTokenPoolFees
                         encodedMessage = encodedMessage
                         verifierBlobs = verifierBlobs
                         receipts = receipts

contracts/ccip/events/daml/CCIP/EventsV1/Events.daml

@@ -28,6 +28,8 @@ data CCIPMessageSentEvent = CCIPMessageSentEvent
         destChainSelector : Numeric 0
         sequenceNumber : Numeric 0
         messageId : BytesHex
+        feeToken : Splice.Api.Token.HoldingV1.InstrumentId
+        tokenAmountBeforeTokenPoolFees : Decimal
         encodedMessage : BytesHex
         verifierBlobs : [BytesHex]
         receipts : [CCIP.EventsV1.Receipts.Receipt]

contracts/ccip/runtime/daml/CCIP/RuntimeV1/OnRamp.daml

@@ -399,9 +399,9 @@ template OnRamp
                     instrumentId = message.feeToken
                     caller = ccipOwner
 
-                let (hasTokenTransfer, tokenInstrumentId) = case message.tokenTransfer of
-                        None -> (False, None)
-                        Some tt -> (True, Some tt.token)
+                let (hasTokenTransfer, tokenInstrumentId, tokenAmountBeforeTokenPoolFees) = case message.tokenTransfer of
+                        None -> (False, None, 0.0)
+                        Some tt -> (True, Some tt.token, tt.amount)
                 let resolvedSenderRequiredCCVs =
                         computeRequiredCCVsForSend
                             destConfig
@@ -476,6 +476,7 @@ template OnRamp
                     feeToken = message.feeToken
                     networkFeeUSDCents = networkFeeUSD
                     expectedTokenInstrumentId = tokenInstrumentId
+                    tokenAmountBeforeTokenPoolFees = tokenAmountBeforeTokenPoolFees
                     outboundPoolCCVs = None
                     executorAddress = resolvedExecutorAddress
                     executionMode = executionMode

contracts/ccip/test/daml/BurnMintTokenPoolTest.daml

@@ -233,6 +233,7 @@ mkSendingMessage ccipOwner sender rmnOwner rmnInstanceId tokenAdminRegistryInsta
       feeToken = instrumentId
       networkFeeUSDCents = 0.0
       expectedTokenInstrumentId = Some instrumentId
+      tokenAmountBeforeTokenPoolFees = 10.0
       outboundPoolCCVs = Some []
       executorArgs = ""
       executorFee = None

contracts/ccip/test/daml/CCVMaxBounds.daml

@@ -356,6 +356,7 @@ mkSendingMessage ccipOwner sender destDefaultCCVs sequenceNumber = do
             feeToken = feeToken
             networkFeeUSDCents = cents 0.0
             expectedTokenInstrumentId = Some tokenInstrumentId
+            tokenAmountBeforeTokenPoolFees = 10.0
             outboundPoolCCVs = None
             executorArgs = ""
             executorFee = None

contracts/ccip/test/daml/CommitteeVerifier/Test.daml

@@ -1051,6 +1051,7 @@ testForwardToVerifier_AllowlistChecksSender = script do
         feeToken = feeToken
         networkFeeUSDCents = 0.0
         expectedTokenInstrumentId = None
+        tokenAmountBeforeTokenPoolFees = 0.0
         outboundPoolCCVs = None
         executorArgs = ""
         executorFee = None