From 274c563ce74e5709dec45de5ee4748cfb7fb8c2a Mon Sep 17 00:00:00 2001
From: Vladimir Shchukin <vladimir.shchukin@smartcontract.com>
Date: Mon, 6 Apr 2026 11:24:43 -0400
Subject: [PATCH] fix transaction return data nil pointer deref

---
 pkg/chains/solana/proto_helpers.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkg/chains/solana/proto_helpers.go b/pkg/chains/solana/proto_helpers.go
index 228e3281de..1f950a9a9b 100644
--- a/pkg/chains/solana/proto_helpers.go
+++ b/pkg/chains/solana/proto_helpers.go
@@ -684,6 +684,11 @@ func ConvertTransactionMetaFromProto(p *TransactionMeta) (*solana.TransactionMet
 	}
 	la := ConvertLoadedAddressesFromProto(p.LoadedAddresses)
 
+	var r solana.ReturnData
+	if ret != nil {
+		r = *ret
+	}
+
 	meta := &solana.TransactionMeta{
 		Err:                  p.ErrJson,
 		Fee:                  p.Fee,
@@ -694,7 +699,7 @@ func ConvertTransactionMetaFromProto(p *TransactionMeta) (*solana.TransactionMet
 		PostTokenBalances:    postTB,
 		LogMessages:          p.LogMessages,
 		LoadedAddresses:      la,
-		ReturnData:           *ret,
+		ReturnData:           r,
 		ComputeUnitsConsumed: p.ComputeUnitsConsumed,
 	}
 	return meta, nil