Merge pull request #3 from neo-project/master

Fix GetTransactionFromBlock Syscall (neo-project#1170)
Qiao-Jin · Oct 23, 2019 · a1af198 · a1af198
2 parents 36c1d16 + e53f533
commit a1af198
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/neo/SmartContract/InteropService.cs b/neo/SmartContract/InteropService.cs
@@ -409,13 +409,13 @@ private static bool Blockchain_GetTransactionFromBlock(ApplicationEngine engine)
             else
             {
                 int index = (int)engine.CurrentContext.EvaluationStack.Pop().GetBigInteger();
-                if (index < 0 || index >= block.Hashes.Length) return false;
+                if (index < 0 || index >= block.Hashes.Length - 1) return false;
 
-                Transaction tx = engine.Snapshot.GetTransaction(block.Hashes[index]);
+                Transaction tx = engine.Snapshot.GetTransaction(block.Hashes[index + 1]);
                 if (tx == null)
                     engine.CurrentContext.EvaluationStack.Push(StackItem.Null);
                 else
-                    engine.CurrentContext.EvaluationStack.Push(StackItem.FromInterface(tx));
+                    engine.CurrentContext.EvaluationStack.Push(tx.ToStackItem());
             }
             return true;
         }