Merge pull request #27 from CityOfZion/revert-26-master

Revert "fix Pop() order in Block_GetTransaction and Account_GetBalance"
CityOfZion · Oct 11, 2017 · 6b9f94c · 6b9f94c
2 parents 0e69a9b + 95ef33e
commit 6b9f94c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/neo/SmartContract/StateReader.py b/neo/SmartContract/StateReader.py
@@ -440,8 +440,8 @@ def Block_GetTransactions(self, engine):
 
     def Block_GetTransaction(self, engine):
 
-        index = engine.EvaluationStack.Pop().GetBigInteger()
         block = engine.EvaluationStack.Pop().GetInterface('neo.Core.Block.Block')
+        index = engine.EvaluationStack.Pop().GetBigInteger()
 
         if block is None or index < 0 or index > len(block.Transactions):
             return False
@@ -597,8 +597,8 @@ def Account_GetVotes(self, engine):
 
     def Account_GetBalance(self, engine):
 
-        assetId = UInt256( data=engine.EvaluationStack.Pop().GetByteArray())
         account = engine.EvaluationStack.Pop().GetInterface('neo.Core.State.AccountState.AccountState')
+        assetId = UInt256( data=engine.EvaluationStack.Pop().GetByteArray())
 
         if account is None:
             return False