Merge pull request #132 from smartcontractkit/feat/stellar-service-tx-fee

Krish-vemula · web-flow · commit 47347f239781 · 2026-06-19T19:39:33.000+05:30
map TXM FeeCharged to SubmitTransactionResponse.TransactionFee
diff --git a/go.mod b/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260518180919-4f70eba1dfd2
 	github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260518180919-4f70eba1dfd2
 	github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260518113836-b4e2fcbb6799
-	github.com/smartcontractkit/chainlink-common v0.11.2-0.20260612151455-287bc497584e
+	github.com/smartcontractkit/chainlink-common v0.11.2-0.20260618182632-7a1ff6408df5
 	github.com/smartcontractkit/chainlink-common/keystore v1.0.2
 	github.com/smartcontractkit/chainlink-deployments-framework v0.101.1
 	github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20260423135514-5b1a7565a99c
@@ -422,7 +422,7 @@ require (
 	github.com/smartcontractkit/chainlink-protos/chainlink-ccv/heartbeat v0.0.0-20260115142640-f6b99095c12e // indirect
 	github.com/smartcontractkit/chainlink-protos/chainlink-ccv/message-discovery v0.0.0-20251211142334-5c3421fe2c8d // indirect
 	github.com/smartcontractkit/chainlink-protos/chainlink-ccv/verifier v0.0.0-20251211142334-5c3421fe2c8d // indirect
-	github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260611123141-db97012a6c32 // indirect
+	github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260618082634-432eb85805e7 // indirect
 	github.com/smartcontractkit/chainlink-protos/job-distributor v0.18.0 // indirect
 	github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20251002192024-d2ad9222409b // indirect
 	github.com/smartcontractkit/chainlink-stellar/bindings v0.0.0-20260616123609-60ff67b1820a
diff --git a/go.sum b/go.sum
@@ -1166,8 +1166,8 @@ github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260518180919-4
 github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260518180919-4f70eba1dfd2/go.mod h1:p2lpE7QJQ4/nI6ZGLmfNz0uAeSt2qKsQ2hRLegZ/HvI=
 github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260518113836-b4e2fcbb6799 h1:zxkcX0vP0NMeptsGVmgMEI0ZBdYedsoaBfkP331whwc=
 github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260518113836-b4e2fcbb6799/go.mod h1:bNMFRxwWdgVFdSsFZRmsUUPoBUncU3RM765K99svIKM=
-github.com/smartcontractkit/chainlink-common v0.11.2-0.20260612151455-287bc497584e h1:PqEa0dqct7xEphFU/AMF7wuB2F5l+/kU6trYhy7Q8Dk=
-github.com/smartcontractkit/chainlink-common v0.11.2-0.20260612151455-287bc497584e/go.mod h1:BCYSFxZTxZEGbyeodKCmfC1MydCEmIf+O29xrLBLnJI=
+github.com/smartcontractkit/chainlink-common v0.11.2-0.20260618182632-7a1ff6408df5 h1:mfBz2dfl9kjrNYPY4y+Fmb5Mt+3csNp4GTU8fJrVsdA=
+github.com/smartcontractkit/chainlink-common v0.11.2-0.20260618182632-7a1ff6408df5/go.mod h1:paOB/6dy57owHtOGzhgaRBWRDT5BEWfnJF5M7sgkcro=
 github.com/smartcontractkit/chainlink-common/keystore v1.0.2 h1:AWisx4JT3QV8tcgh6J5NCrex+wAgTYpWyHsyNPSXzsQ=
 github.com/smartcontractkit/chainlink-common/keystore v1.0.2/go.mod h1:rSkIHdomyak3YnUtXLenl6poIq8q0V3UZPiiyYqPdGA=
 github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260528204832-58c7145c53f8 h1:5O2qAtvBLzTHBeSIPcxt9i9BCqqOyeroVxN0xbXwoS0=
@@ -1194,8 +1194,8 @@ github.com/smartcontractkit/chainlink-protos/chainlink-ccv/message-rules v0.0.0-
 github.com/smartcontractkit/chainlink-protos/chainlink-ccv/message-rules v0.0.0-20260505131349-78e491b80735/go.mod h1:zAJq6Tpkx5AdFUwW67dIYnW+Bdf50drCCpMR81Qxb4E=
 github.com/smartcontractkit/chainlink-protos/chainlink-ccv/verifier v0.0.0-20251211142334-5c3421fe2c8d h1:AJy55QJ/pBhXkZjc7N+ATnWfxrcjq9BI9DmdtdjwDUQ=
 github.com/smartcontractkit/chainlink-protos/chainlink-ccv/verifier v0.0.0-20251211142334-5c3421fe2c8d/go.mod h1:5JdppgngCOUS76p61zCinSCgOhPeYQ+OcDUuome5THQ=
-github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260611123141-db97012a6c32 h1:GNl+lLK0QCakqA1J1i7FoOai2JrOGOzNzSniMijaCjA=
-github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260611123141-db97012a6c32/go.mod h1:vTFHTCbLui4Vn8fTmAadfE3rdnvfrDwOmMujmW857D0=
+github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260618082634-432eb85805e7 h1:iRFmfMFQtcnhGDjCuARQG4MPbcmbbJDDw7MUH3GcGy8=
+github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260618082634-432eb85805e7/go.mod h1:vTFHTCbLui4Vn8fTmAadfE3rdnvfrDwOmMujmW857D0=
 github.com/smartcontractkit/chainlink-protos/job-distributor v0.18.0 h1:q+VDPcxWrj5k9QizSYfUOSMnDH3Sd5HvbPguZOgfXTY=
 github.com/smartcontractkit/chainlink-protos/job-distributor v0.18.0/go.mod h1:/dVVLXrsp+V0AbcYGJo3XMzKg3CkELsweA/TTopCsKE=
 github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20251002192024-d2ad9222409b h1:QuI6SmQFK/zyUlVWEf0GMkiUYBPY4lssn26nKSd/bOM=
diff --git a/relayer/stellar_service.go b/relayer/stellar_service.go
@@ -241,6 +241,14 @@ func (s *stellarService) SubmitTransaction(ctx context.Context, req stellartypes
 		ResultXDR:        result.ResultXDR,
 		ResultMetaXDR:    result.ResultMetaXDR,
 	}
+	if result.Fee != nil && result.Fee.IsUint64() {
+		fee := result.Fee.Uint64()
+		reply.TransactionFee = &fee
+	}
+	if result.LedgerCloseTime > 0 {
+		ts := uint64(result.LedgerCloseTime) * 1_000_000
+		reply.BlockTimestamp = &ts
+	}
 
 	switch result.Status {
 	case relaytypes.Finalized:
diff --git a/relayer/stellar_service_test.go b/relayer/stellar_service_test.go
@@ -3,6 +3,7 @@ package relayer
 import (
 	"context"
 	"errors"
+	"math/big"
 	"testing"
 
 	protocol "github.com/stellar/go-stellar-sdk/protocols/rpc"
@@ -365,11 +366,13 @@ func TestStellarService_SubmitTransaction(t *testing.T) {
 				require.Len(t, req.Operations, 1)
 				require.Equal(t, uint32(2), req.LedgerBoundsOffset)
 				return &txm.TxResult{
-					ID:            "idem-1",
-					Hash:          "txhash123",
-					Status:        commontypes.Finalized,
-					ResultXDR:     "resultXDR",
-					ResultMetaXDR: "metaXDR",
+					ID:              "idem-1",
+					Hash:            "txhash123",
+					Status:          commontypes.Finalized,
+					Fee:             big.NewInt(42_000),
+					LedgerCloseTime: 1_700_000_000,
+					ResultXDR:       "resultXDR",
+					ResultMetaXDR:   "metaXDR",
 				}, nil
 			})
 
@@ -381,6 +384,10 @@ func TestStellarService_SubmitTransaction(t *testing.T) {
 		require.Equal(t, "idem-1", reply.TxIdempotencyKey)
 		require.Equal(t, "resultXDR", reply.ResultXDR)
 		require.Equal(t, "metaXDR", reply.ResultMetaXDR)
+		require.NotNil(t, reply.TransactionFee)
+		require.Equal(t, uint64(42_000), *reply.TransactionFee)
+		require.NotNil(t, reply.BlockTimestamp)
+		require.Equal(t, uint64(1_700_000_000_000_000), *reply.BlockTimestamp)
 	})
 
 	t.Run("Failed_OnChain", func(t *testing.T) {
diff --git a/relayer/txm/tx.go b/relayer/txm/tx.go
@@ -22,8 +22,9 @@ type StellarTx struct {
 	Attempt        uint64
 	Status         commontypes.TransactionStatus
 	TxHash         string
-	Fee            *big.Int // total fee in stroops; updated to actual FeeCharged on confirmation
-	ResultXDR      string   // XDR-encoded transaction result from GetTransaction
+	Fee             *big.Int // total fee in stroops; updated to actual FeeCharged on confirmation
+	LedgerCloseTime int64    // unix seconds when tx was included in a ledger; from GetTransaction
+	ResultXDR       string   // XDR-encoded transaction result from GetTransaction
 	ResultCode     string   // result code from GetTransaction (for diagnostics)
 	ResultMetaXDR  string   // XDR-encoded result meta from GetTransaction SUCCESS
 	MaxLedger      uint32   // ledger bounds set during broadcast
@@ -48,8 +49,9 @@ type TxResult struct {
 	ID            string
 	Hash          string
 	Status        commontypes.TransactionStatus
-	Fee           *big.Int // total fee charged in stroops
-	ResultXDR     string   // XDR-encoded transaction result from GetTransaction
+	Fee             *big.Int // total fee charged in stroops
+	LedgerCloseTime int64    // unix seconds when tx was included in a ledger; 0 if unknown
+	ResultXDR       string   // XDR-encoded transaction result from GetTransaction
 	ResultMetaXDR string   // XDR-encoded result meta from GetTransaction
 	Error         error
 }
diff --git a/relayer/txm/txm.go b/relayer/txm/txm.go
@@ -224,12 +224,13 @@ func (s *StellarTxm) txResult(tx *StellarTx) *TxResult {
 
 func (s *StellarTxm) txResultLocked(tx *StellarTx) *TxResult {
 	result := &TxResult{
-		ID:            tx.ID,
-		Hash:          tx.TxHash,
-		Status:        tx.Status,
-		Fee:           tx.Fee,
-		ResultXDR:     tx.ResultXDR,
-		ResultMetaXDR: tx.ResultMetaXDR,
+		ID:              tx.ID,
+		Hash:            tx.TxHash,
+		Status:          tx.Status,
+		Fee:             tx.Fee,
+		LedgerCloseTime: tx.LedgerCloseTime,
+		ResultXDR:       tx.ResultXDR,
+		ResultMetaXDR:   tx.ResultMetaXDR,
 	}
 	if tx.ResultCode != "" {
 		result.Error = fmt.Errorf("transaction result: %s", tx.ResultCode)
@@ -435,6 +436,15 @@ func (s *StellarTxm) updateTransactionFee(tx *StellarTx, fee *big.Int) {
 	tx.Fee = fee
 }
 
+func (s *StellarTxm) updateTransactionLedgerCloseTime(tx *StellarTx, ledgerCloseTime int64) {
+	if ledgerCloseTime <= 0 {
+		return
+	}
+	s.transactionsLock.Lock()
+	defer s.transactionsLock.Unlock()
+	tx.LedgerCloseTime = ledgerCloseTime
+}
+
 func (s *StellarTxm) updateTransactionResultXDR(tx *StellarTx, resultXDR string) {
 	s.transactionsLock.Lock()
 	defer s.transactionsLock.Unlock()
@@ -881,6 +891,7 @@ func (s *StellarTxm) checkUnconfirmed(ctx context.Context) {
 					if resp.ResultMetaXDR != "" {
 						s.updateTransactionResultMeta(utx.Tx, resp.ResultMetaXDR)
 					}
+					s.updateTransactionLedgerCloseTime(utx.Tx, resp.LedgerCloseTime)
 
 					ctxLogger.Infow("confirmed tx: successful", "hash", hash)
 					s.metrics.IncrementSuccessTxs(ctx)
@@ -895,6 +906,7 @@ func (s *StellarTxm) checkUnconfirmed(ctx context.Context) {
 					s.updateTransactionResultXDR(utx.Tx, resp.ResultXDR)
 					classification := classifyFailedTransactionResult(resp.ResultXDR)
 					s.updateTransactionResultCode(utx.Tx, classification.resultCode)
+					s.updateTransactionLedgerCloseTime(utx.Tx, resp.LedgerCloseTime)
 
 					ctxLogger.Infow("confirmed tx: failed on-chain", "hash", hash, "resultCode", classification.resultCode, "retryable", classification.retryable)
 					s.metrics.IncrementErrorTxs(ctx, classification.resultCode)
diff --git a/relayer/txm/txm_test.go b/relayer/txm/txm_test.go
@@ -1235,6 +1235,7 @@ func TestStellarTxm_ConfirmLoop_UpdatesFeeAndMetaFromXDR(t *testing.T) {
 		getLatestLedgerResp:  protocolrpc.GetLatestLedgerResponse{Sequence: 1000},
 		sendTransactionResp:  protocolrpc.SendTransactionResponse{Status: stellarcore.TXStatusPending, Hash: "test-hash"},
 		getTransactionResp: protocolrpc.GetTransactionResponse{
+			LedgerCloseTime: 1_700_000_000,
 			TransactionDetails: protocolrpc.TransactionDetails{
 				Status:        protocolrpc.TransactionStatusSuccess,
 				ResultXDR:     resultB64,
@@ -1271,6 +1272,7 @@ func TestStellarTxm_ConfirmLoop_UpdatesFeeAndMetaFromXDR(t *testing.T) {
 	txm.transactionsLock.RUnlock()
 	require.NotNil(t, tracked)
 	assert.Equal(t, big.NewInt(40_200), tracked.Fee)
+	assert.Equal(t, int64(1_700_000_000), tracked.LedgerCloseTime)
 	assert.Equal(t, resultB64, tracked.ResultXDR)
 	assert.Equal(t, metaB64, tracked.ResultMetaXDR)
 
@@ -1279,6 +1281,7 @@ func TestStellarTxm_ConfirmLoop_UpdatesFeeAndMetaFromXDR(t *testing.T) {
 	assert.Equal(t, "test-hash", result.Hash)
 	assert.Equal(t, commontypes.Finalized, result.Status)
 	assert.Equal(t, big.NewInt(40_200), result.Fee)
+	assert.Equal(t, int64(1_700_000_000), result.LedgerCloseTime)
 	assert.Equal(t, resultB64, result.ResultXDR)
 	assert.Equal(t, metaB64, result.ResultMetaXDR)
 	assert.NoError(t, result.Error)
@@ -1294,6 +1297,7 @@ func TestStellarTxm_ConfirmLoop_TerminalContractFailureDoesNotRetry(t *testing.T
 		sendTransactionResp:  protocolrpc.SendTransactionResponse{Status: stellarcore.TXStatusPending, Hash: "test-hash"},
 		simulateResp:         protocolrpc.SimulateTransactionResponse{MinResourceFee: 10_000},
 		getTransactionResp: protocolrpc.GetTransactionResponse{
+			LedgerCloseTime: 1_700_000_001,
 			TransactionDetails: protocolrpc.TransactionDetails{
 				Status:    protocolrpc.TransactionStatusFailed,
 				ResultXDR: resultB64,
@@ -1318,13 +1322,15 @@ func TestStellarTxm_ConfirmLoop_TerminalContractFailureDoesNotRetry(t *testing.T
 	txm.transactionsLock.RUnlock()
 	require.NotNil(t, tracked)
 	assert.Equal(t, uint64(0), tracked.Attempt)
+	assert.Equal(t, int64(1_700_000_001), tracked.LedgerCloseTime)
 	assert.Equal(t, resultB64, tracked.ResultXDR)
 	assert.Equal(t, xdr.InvokeHostFunctionResultCodeInvokeHostFunctionTrapped.String(), tracked.ResultCode)
 
 	result, err := txm.GetTransactionResult(txID)
 	require.NoError(t, err)
 	assert.Equal(t, "test-hash", result.Hash)
 	assert.Equal(t, commontypes.Failed, result.Status)
+	assert.Equal(t, int64(1_700_000_001), result.LedgerCloseTime)
 	assert.Equal(t, resultB64, result.ResultXDR)
 	require.Error(t, result.Error)
 	assert.Contains(t, result.Error.Error(), xdr.InvokeHostFunctionResultCodeInvokeHostFunctionTrapped.String())
