Updated examples & instruction decoder to cast to TransactionInfo.

BifrostTitan · BifrostTitan · commit ab11a4ce5efd · 2025-02-12T18:01:42.000-05:00
Updated examples &amp; instruction decoder to cast to TransactionInfo. Added dynamic type conversion for rewardtype
diff --git a/src/Solnet.Examples/InstructionDecoderExample.cs b/src/Solnet.Examples/InstructionDecoderExample.cs
@@ -72,11 +72,11 @@ public void Run()
 
                 foreach (TransactionMetaInfo txMeta in block.Result.Transactions)
                 {
-                    if (txMeta.Transaction.Message.Instructions.Length == 1 && "Vote111111111111111111111111111111111111111" == txMeta.Transaction.Message.AccountKeys[txMeta.Transaction.Message.Instructions[0].ProgramIdIndex]) continue;
-                    if (txMeta.Transaction.Message.Instructions.Length < 2) continue;
-                    Console.WriteLine($"\n\t\tDECODING INSTRUCTIONS FROM TRANSACTION {txMeta.Transaction.Signatures[0]}");
+                    if (((TransactionInfo)txMeta.Transaction).Message.Instructions.Length == 1 && "Vote111111111111111111111111111111111111111" == ((TransactionInfo)txMeta.Transaction).Message.AccountKeys[((TransactionInfo)txMeta.Transaction).Message.Instructions[0].ProgramIdIndex]) continue;
+                    if (((TransactionInfo)txMeta.Transaction).Message.Instructions.Length < 2) continue;
+                    Console.WriteLine($"\n\t\tDECODING INSTRUCTIONS FROM TRANSACTION {((TransactionInfo)txMeta.Transaction).Signatures[0]}");
 
-                    Console.WriteLine($"Instructions: {txMeta.Transaction.Message.Instructions.Length}");
+                    Console.WriteLine($"Instructions: {((TransactionInfo)txMeta.Transaction).Message.Instructions.Length}");
                     Console.WriteLine($"InnerInstructions: {txMeta.Meta.InnerInstructions.Length}");
                     var decodedInstructions = InstructionDecoder.DecodeInstructions(txMeta);
 
diff --git a/src/Solnet.Programs/InstructionDecoder.cs b/src/Solnet.Programs/InstructionDecoder.cs
@@ -73,24 +73,24 @@ public static List<DecodedInstruction> DecodeInstructions(TransactionMetaInfo tx
         {
             List<DecodedInstruction> decodedInstructions = new();
 
-            for (int i = 0; i < txMetaInfo.Transaction.Message.Instructions.Length; i++)
+            for (int i = 0; i < ((TransactionInfo)txMetaInfo.Transaction).Message.Instructions.Length; i++)
             {
                 DecodedInstruction decodedInstruction = null;
-                InstructionInfo instructionInfo = txMetaInfo.Transaction.Message.Instructions[i];
-                string programKey = txMetaInfo.Transaction.Message.AccountKeys[instructionInfo.ProgramIdIndex];
+                InstructionInfo instructionInfo = ((TransactionInfo)txMetaInfo.Transaction).Message.Instructions[i];
+                string programKey = ((TransactionInfo)txMetaInfo.Transaction).Message.AccountKeys[instructionInfo.ProgramIdIndex];
                 bool registered = InstructionDictionary.TryGetValue(programKey, out DecodeMethodType method);
 
                 if (!registered)
                 {
                     decodedInstruction = AddUnknownInstruction(
-                        instructionInfo, programKey, txMetaInfo.Transaction.Message.AccountKeys,
-                        txMetaInfo.Transaction.Message.Instructions[i].Accounts);
+                        instructionInfo, programKey, ((TransactionInfo)txMetaInfo.Transaction).Message.AccountKeys,
+                        ((TransactionInfo)txMetaInfo.Transaction).Message.Instructions[i].Accounts);
                 }
                 else
                 {
                     decodedInstruction = method.Invoke(
                                         Encoders.Base58.DecodeData(instructionInfo.Data),
-                                        txMetaInfo.Transaction.Message.AccountKeys.Select(a => new PublicKey(a)).ToList(),
+                                        ((TransactionInfo)txMetaInfo.Transaction).Message.AccountKeys.Select(a => new PublicKey(a)).ToList(),
                                         instructionInfo.Accounts.Select(instr => (byte)instr).ToArray());
                 }
                 if (txMetaInfo.Meta.InnerInstructions != null)
@@ -102,20 +102,20 @@ public static List<DecodedInstruction> DecodeInstructions(TransactionMetaInfo tx
                         foreach (InstructionInfo innerInstructionInfo in innerInstruction.Instructions)
                         {
                             DecodedInstruction innerDecodedInstruction = null;
-                            programKey = txMetaInfo.Transaction.Message.AccountKeys[innerInstructionInfo.ProgramIdIndex];
+                            programKey = ((TransactionInfo)txMetaInfo.Transaction).Message.AccountKeys[innerInstructionInfo.ProgramIdIndex];
                             registered = InstructionDictionary.TryGetValue(programKey, out method);
 
                             if (!registered)
                             {
                                 innerDecodedInstruction = AddUnknownInstruction(
-                                    innerInstructionInfo, programKey, txMetaInfo.Transaction.Message.AccountKeys,
-                                    txMetaInfo.Transaction.Message.Instructions[i].Accounts);
+                                    innerInstructionInfo, programKey, ((TransactionInfo)txMetaInfo.Transaction).Message.AccountKeys,
+                                    ((TransactionInfo)txMetaInfo.Transaction).Message.Instructions[i].Accounts);
                             }
                             else
                             {
                                 innerDecodedInstruction = method.Invoke(
                                     Encoders.Base58.DecodeData(innerInstructionInfo.Data),
-                                    txMetaInfo.Transaction.Message.AccountKeys.Select(a => new PublicKey(a)).ToList(),
+                                    ((TransactionInfo)txMetaInfo.Transaction).Message.AccountKeys.Select(a => new PublicKey(a)).ToList(),
                                     innerInstructionInfo.Accounts.Select(instr => (byte)instr).ToArray());
                             }
                             if (innerDecodedInstruction != null)
diff --git a/src/Solnet.Rpc/Models/RewardInfo.cs b/src/Solnet.Rpc/Models/RewardInfo.cs
@@ -1,4 +1,6 @@
-﻿namespace Solnet.Rpc.Models
+﻿using System.Text.Json.Serialization;
+
+namespace Solnet.Rpc.Models
 {
     /// <summary>
     /// Represents the reward information related to a given account.
@@ -19,6 +21,8 @@ public class RewardInfo
         /// </summary>
         public ulong PostBalance { get; set; }
 
+        [JsonConverter(typeof(DynamicTypeConverter))]
+        public object RewardType {  get; set; }
     }
   
     /// <summary>
diff --git a/src/Solnet.Rpc/Models/TransactionData.cs b/src/Solnet.Rpc/Models/TransactionData.cs
@@ -42,7 +42,7 @@ public class TransactionMetaInfo
         /// Transaction Version
         /// </summary>
         ///  [JsonPropertyName("value")]
-        [JsonConverter(typeof(VersionConverter))]
+        [JsonConverter(typeof(DynamicTypeConverter))]
         public object Version { get; set; }
     }
     /// <summary>
@@ -104,7 +104,7 @@ public override void Write(Utf8JsonWriter writer, object value, JsonSerializerOp
     /// <summary>
     /// Json Converter for handling string and integer version types
     /// </summary>
-    public class VersionConverter : JsonConverter<object>
+    public class DynamicTypeConverter : JsonConverter<object>
     {
 
         /// <summary>
diff --git a/test/Solnet.Rpc.Test/SolanaRpcClientBlockTests.cs b/test/Solnet.Rpc.Test/SolanaRpcClientBlockTests.cs
@@ -68,22 +68,22 @@ public void TestGetBlock()
             Assert.AreEqual(0, first.Meta.PostTokenBalances.Length);
             Assert.AreEqual(0, first.Meta.PreTokenBalances.Length);
 
-            Assert.AreEqual(1, first.Transaction.Signatures.Length);
-            Assert.AreEqual("2Hh35eZPP1wZLYQ1HHv8PqGoRo73XirJeKFpBVc19msi6qeJHk3yUKqS1viRtqkdb545CerTWeywPFXxjKEhDWTK", first.Transaction.Signatures[0]);
+            Assert.AreEqual(1, ((TransactionInfo)first.Transaction).Signatures.Length);
+            Assert.AreEqual("2Hh35eZPP1wZLYQ1HHv8PqGoRo73XirJeKFpBVc19msi6qeJHk3yUKqS1viRtqkdb545CerTWeywPFXxjKEhDWTK", ((TransactionInfo)first.Transaction).Signatures[0]);
 
-            Assert.AreEqual(5, first.Transaction.Message.AccountKeys.Length);
-            Assert.AreEqual("DjuMPGThkGdyk2vDvDDYjTFSyxzTumdapnDNbvVZbYQE", first.Transaction.Message.AccountKeys[0]);
+            Assert.AreEqual(5,((TransactionInfo)first.Transaction).Message.AccountKeys.Length);
+            Assert.AreEqual("DjuMPGThkGdyk2vDvDDYjTFSyxzTumdapnDNbvVZbYQE",((TransactionInfo)first.Transaction).Message.AccountKeys[0]);
 
-            Assert.AreEqual(0, first.Transaction.Message.Header.NumReadonlySignedAccounts);
-            Assert.AreEqual(3, first.Transaction.Message.Header.NumReadonlyUnsignedAccounts);
-            Assert.AreEqual(1, first.Transaction.Message.Header.NumRequiredSignatures);
+            Assert.AreEqual(0,((TransactionInfo)first.Transaction).Message.Header.NumReadonlySignedAccounts);
+            Assert.AreEqual(3,((TransactionInfo)first.Transaction).Message.Header.NumReadonlyUnsignedAccounts);
+            Assert.AreEqual(1,((TransactionInfo)first.Transaction).Message.Header.NumRequiredSignatures);
 
-            Assert.AreEqual(1, first.Transaction.Message.Instructions.Length);
-            Assert.AreEqual(4, first.Transaction.Message.Instructions[0].Accounts.Length);
-            Assert.AreEqual("2ZjTR1vUs2pHXyTLxtFDhN2tsm2HbaH36cAxzJcwaXf8y5jdTESsGNBLFaxGuWENxLa2ZL3cX9foNJcWbRq", first.Transaction.Message.Instructions[0].Data);
-            Assert.AreEqual(4, first.Transaction.Message.Instructions[0].ProgramIdIndex);
+            Assert.AreEqual(1,((TransactionInfo)first.Transaction).Message.Instructions.Length);
+            Assert.AreEqual(4,((TransactionInfo)first.Transaction).Message.Instructions[0].Accounts.Length);
+            Assert.AreEqual("2ZjTR1vUs2pHXyTLxtFDhN2tsm2HbaH36cAxzJcwaXf8y5jdTESsGNBLFaxGuWENxLa2ZL3cX9foNJcWbRq",((TransactionInfo)first.Transaction).Message.Instructions[0].Data);
+            Assert.AreEqual(4,((TransactionInfo)first.Transaction).Message.Instructions[0].ProgramIdIndex);
 
-            Assert.AreEqual("D8qh6AeX4KaTe6ZBpsZDdntTQUyPy7x6Xjp7NnEigCWH", first.Transaction.Message.RecentBlockhash);
+            Assert.AreEqual("D8qh6AeX4KaTe6ZBpsZDdntTQUyPy7x6Xjp7NnEigCWH",((TransactionInfo)first.Transaction).Message.RecentBlockhash);
             FinishTest(messageHandlerMock, TestnetUri);
         }
 
@@ -282,25 +282,25 @@ public void TestGetTransaction()
             Assert.AreEqual(0, first.Meta.PostTokenBalances.Length);
             Assert.AreEqual(0, first.Meta.PreTokenBalances.Length);
 
-            Assert.AreEqual(1, first.Transaction.Signatures.Length);
-            Assert.AreEqual("5as3w4KMpY23MP5T1nkPVksjXjN7hnjHKqiDxRMxUNcw5XsCGtStayZib1kQdyR2D9w8dR11Ha9Xk38KP3kbAwM1", first.Transaction.Signatures[0]);
+            Assert.AreEqual(1, ((TransactionInfo)first.Transaction).Signatures.Length);
+            Assert.AreEqual("5as3w4KMpY23MP5T1nkPVksjXjN7hnjHKqiDxRMxUNcw5XsCGtStayZib1kQdyR2D9w8dR11Ha9Xk38KP3kbAwM1", ((TransactionInfo)first.Transaction).Signatures[0]);
 
-            Assert.AreEqual(5, first.Transaction.Message.AccountKeys.Length);
-            Assert.AreEqual("EvVrzsxoj118sxxSTrcnc9u3fRdQfCc7d4gRzzX6TSqj", first.Transaction.Message.AccountKeys[0]);
+            Assert.AreEqual(5, ((TransactionInfo)first.Transaction).Message.AccountKeys.Length);
+            Assert.AreEqual("EvVrzsxoj118sxxSTrcnc9u3fRdQfCc7d4gRzzX6TSqj",((TransactionInfo)first.Transaction).Message.AccountKeys[0]);
 
-            Assert.AreEqual(0, first.Transaction.Message.Header.NumReadonlySignedAccounts);
-            Assert.AreEqual(3, first.Transaction.Message.Header.NumReadonlyUnsignedAccounts);
-            Assert.AreEqual(1, first.Transaction.Message.Header.NumRequiredSignatures);
+            Assert.AreEqual(0, ((TransactionInfo)first.Transaction).Message.Header.NumReadonlySignedAccounts);
+            Assert.AreEqual(3, ((TransactionInfo)first.Transaction).Message.Header.NumReadonlyUnsignedAccounts);
+            Assert.AreEqual(1, ((TransactionInfo)first.Transaction).Message.Header.NumRequiredSignatures);
 
-            Assert.AreEqual(1, first.Transaction.Message.Instructions.Length);
-            Assert.AreEqual(4, first.Transaction.Message.Instructions[0].Accounts.Length);
+            Assert.AreEqual(1, ((TransactionInfo)first.Transaction).Message.Instructions.Length);
+            Assert.AreEqual(4, ((TransactionInfo)first.Transaction).Message.Instructions[0].Accounts.Length);
             Assert.AreEqual("2kr3BYaDkghC7rvHsQYnBNoB4dhXrUmzgYMM4kbHSG7ALa3qsMPxfC9cJTFDKyJaC8VYSjrey9pvyRivtESUJrC3qzr89pvS2o6MQ"
                 + "hyRVxmh3raQStxFFYwZ6WyKFNoQXvcchBwy8uQGfhhUqzuLNREwRmZ5U2VgTjFWX8Vikqya6iyzvALQNZEvqz7ZoGEyRtJ6AzNyWbkUyEo63rZ5w3wnxmhr3Uood",
-                first.Transaction.Message.Instructions[0].Data);
+                ((TransactionInfo)first.Transaction).Message.Instructions[0].Data);
 
-            Assert.AreEqual(4, first.Transaction.Message.Instructions[0].ProgramIdIndex);
+            Assert.AreEqual(4, ((TransactionInfo)first.Transaction).Message.Instructions[0].ProgramIdIndex);
 
-            Assert.AreEqual("6XGYfEJ5CGGBA5E8E7Gw4ToyDLDNNAyUCb7CJj1rLk21", first.Transaction.Message.RecentBlockhash);
+            Assert.AreEqual("6XGYfEJ5CGGBA5E8E7Gw4ToyDLDNNAyUCb7CJj1rLk21",((TransactionInfo)first.Transaction).Message.RecentBlockhash);
             FinishTest(messageHandlerMock, TestnetUri);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -73,24 +73,24 @@ public static List<DecodedInstruction> DecodeInstructions(TransactionMetaInfo tx`
`73`	`73`	`{`
`74`	`74`	`List<DecodedInstruction> decodedInstructions = new();`
`75`	`75`
`76`		`- for (int i = 0; i < txMetaInfo.Transaction.Message.Instructions.Length; i++)`
	`76`	`+ for (int i = 0; i < ((TransactionInfo)txMetaInfo.Transaction).Message.Instructions.Length; i++)`
`77`	`77`	`{`
`78`	`78`	`DecodedInstruction decodedInstruction = null;`
`79`		`- InstructionInfo instructionInfo = txMetaInfo.Transaction.Message.Instructions[i];`
`80`		`- string programKey = txMetaInfo.Transaction.Message.AccountKeys[instructionInfo.ProgramIdIndex];`
	`79`	`+ InstructionInfo instructionInfo = ((TransactionInfo)txMetaInfo.Transaction).Message.Instructions[i];`
	`80`	`+ string programKey = ((TransactionInfo)txMetaInfo.Transaction).Message.AccountKeys[instructionInfo.ProgramIdIndex];`
`81`	`81`	`bool registered = InstructionDictionary.TryGetValue(programKey, out DecodeMethodType method);`
`82`	`82`
`83`	`83`	`if (!registered)`
`84`	`84`	`{`
`85`	`85`	`decodedInstruction = AddUnknownInstruction(`
`86`		`- instructionInfo, programKey, txMetaInfo.Transaction.Message.AccountKeys,`
`87`		`- txMetaInfo.Transaction.Message.Instructions[i].Accounts);`
	`86`	`+ instructionInfo, programKey, ((TransactionInfo)txMetaInfo.Transaction).Message.AccountKeys,`
	`87`	`+ ((TransactionInfo)txMetaInfo.Transaction).Message.Instructions[i].Accounts);`
`88`	`88`	`}`
`89`	`89`	`else`
`90`	`90`	`{`
`91`	`91`	`decodedInstruction = method.Invoke(`
`92`	`92`	`Encoders.Base58.DecodeData(instructionInfo.Data),`
`93`		`- txMetaInfo.Transaction.Message.AccountKeys.Select(a => new PublicKey(a)).ToList(),`
	`93`	`+ ((TransactionInfo)txMetaInfo.Transaction).Message.AccountKeys.Select(a => new PublicKey(a)).ToList(),`
`94`	`94`	`instructionInfo.Accounts.Select(instr => (byte)instr).ToArray());`
`95`	`95`	`}`
`96`	`96`	`if (txMetaInfo.Meta.InnerInstructions != null)`
`@@ -102,20 +102,20 @@ public static List<DecodedInstruction> DecodeInstructions(TransactionMetaInfo tx`
`102`	`102`	`foreach (InstructionInfo innerInstructionInfo in innerInstruction.Instructions)`
`103`	`103`	`{`
`104`	`104`	`DecodedInstruction innerDecodedInstruction = null;`
`105`		`- programKey = txMetaInfo.Transaction.Message.AccountKeys[innerInstructionInfo.ProgramIdIndex];`
	`105`	`+ programKey = ((TransactionInfo)txMetaInfo.Transaction).Message.AccountKeys[innerInstructionInfo.ProgramIdIndex];`
`106`	`106`	`registered = InstructionDictionary.TryGetValue(programKey, out method);`
`107`	`107`
`108`	`108`	`if (!registered)`
`109`	`109`	`{`
`110`	`110`	`innerDecodedInstruction = AddUnknownInstruction(`
`111`		`- innerInstructionInfo, programKey, txMetaInfo.Transaction.Message.AccountKeys,`
`112`		`- txMetaInfo.Transaction.Message.Instructions[i].Accounts);`
	`111`	`+ innerInstructionInfo, programKey, ((TransactionInfo)txMetaInfo.Transaction).Message.AccountKeys,`
	`112`	`+ ((TransactionInfo)txMetaInfo.Transaction).Message.Instructions[i].Accounts);`
`113`	`113`	`}`
`114`	`114`	`else`
`115`	`115`	`{`
`116`	`116`	`innerDecodedInstruction = method.Invoke(`
`117`	`117`	`Encoders.Base58.DecodeData(innerInstructionInfo.Data),`
`118`		`- txMetaInfo.Transaction.Message.AccountKeys.Select(a => new PublicKey(a)).ToList(),`
	`118`	`+ ((TransactionInfo)txMetaInfo.Transaction).Message.AccountKeys.Select(a => new PublicKey(a)).ToList(),`
`119`	`119`	`innerInstructionInfo.Accounts.Select(instr => (byte)instr).ToArray());`
`120`	`120`	`}`
`121`	`121`	`if (innerDecodedInstruction != null)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`		`-namespace Solnet.Rpc.Models`
	`1`	`+using System.Text.Json.Serialization;`
	`2`	`+`
	`3`	`+namespace Solnet.Rpc.Models`
`2`	`4`	`{`
`3`	`5`	`/// <summary>`
`4`	`6`	`/// Represents the reward information related to a given account.`
`@@ -19,6 +21,8 @@ public class RewardInfo`
`19`	`21`	`/// </summary>`
`20`	`22`	`public ulong PostBalance { get; set; }`
`21`	`23`
	`24`	`+ [JsonConverter(typeof(DynamicTypeConverter))]`
	`25`	`+ public object RewardType { get; set; }`
`22`	`26`	`}`
`23`	`27`
`24`	`28`	`/// <summary>`