merge tx invoke fee fixes

neo/Prompt/Commands/Invoke.py

@@ -38,10 +38,10 @@
 import pdb
 import json
 
-def InvokeContract(wallet, tx):
+def InvokeContract(wallet, tx, fee=Fixed8.Zero()):
 
 
-    wallet_tx = wallet.MakeTransaction(tx=tx)
+    wallet_tx = wallet.MakeTransaction(tx=tx,fee=fee)
 
     if wallet_tx:
 
@@ -211,17 +211,24 @@ def test_invoke(script, wallet, outputs):
             consumed = engine.GasConsumed() - Fixed8.FromDecimal(10)
             consumed.value = int(consumed.value)
 
+            net_fee = None
+            tx_gas = None
+
             if consumed < Fixed8.One():
-                consumed = Fixed8.One()
+                net_fee = Fixed8.FromDecimal(.001)
+                tx_gas = Fixed8.Zero()
+            else:
+                tx_gas = consumed
+                net_fee = Fixed8.Zero()
 
             #set the amount of gas the tx will need
-            wallet_tx.Gas = consumed
+            wallet_tx.Gas = tx_gas
 
             #reset the wallet outputs
             wallet_tx.outputs = outputs
             wallet_tx.Attributes = []
 
-            return wallet_tx, engine.EvaluationStack.Items
+            return wallet_tx, net_fee, engine.EvaluationStack.Items, engine.ops_processed
         else:
             print("error executing contract.....")
 #            tx.Gas = Fixed8.One()
@@ -342,7 +349,6 @@ def test_deploy_and_invoke(deploy_script, invoke_args, wallet):
                                            script_hash=contract_state.Code.ScriptHash(),
                                            )
                 outputs.append(output)
-                print("NEO TO ATTACH: %s " % outputs)
 
             if gas_to_attach:
                 output = TransactionOutput(AssetId=Blockchain.SystemCoin().Hash,
@@ -396,13 +402,16 @@ def test_deploy_and_invoke(deploy_script, invoke_args, wallet):
                 consumed.value = int(consumed.value)
 
                 if consumed < Fixed8.One():
-                    consumed = Fixed8.One()
+                    consumed = Fixed8.FromDecimal(.001)
+
+
+                total_ops = engine.ops_processed
 
                 # set the amount of gas the tx will need
                 itx.Gas = consumed
                 itx.Attributes = []
                 result = engine.ResultsForCode(contract_state.Code)
-                return itx, result
+                return itx, result, total_ops
             else:
                 print("error executing invoke contract...")
 

neo/SmartContract/StateReader.py

@@ -579,9 +579,12 @@ def Output_GetScriptHash(self, engine):
 
     def Account_GetScriptHash(self, engine):
 
+        print("getting account script hash!!!! ")
         account = engine.EvaluationStack.Pop().GetInterface('neo.Core.State.AccountState.AccountState')
+        print("acccount isssss...... %s " % account)
         if account is None:
             return False
+        print("pushing account script hash onto account....")
         engine.EvaluationStack.PushT(account.ScriptHash.ToArray())
         return True
 
@@ -695,6 +698,7 @@ def Storage_Get(self, engine):
             context = item.GetInterface('neo.SmartContract.StorageContext.StorageContext')
             shash = context.ScriptHash
         except Exception as e:
+            print("could not get storage context %s " % e)
             return False
 
 

neo/VM/ExecutionEngine.py

@@ -30,6 +30,7 @@ class ExecutionEngine():
     _AltStack = None
 
 
+    ops_processed = 0
 
     @property
     def ScriptContainer(self):
@@ -80,6 +81,7 @@ def __init__(self, container=None, crypto=None, table=None, service = None):
         self._EvaluationStack = RandomAccessStack(name='Evaluation')
         self._AltStack = RandomAccessStack(name='Alt')
 
+        self.ops_processed = 0
 
     def AddBreakPoint(self, position):
         self.CurrentContext.Breakpoints.add(position)
@@ -798,6 +800,8 @@ def StepInto(self):
  #       print("%s -> %s" % (op, opname))
  #       print("-----------------------------------")
 
+        self.ops_processed += 1
+
         try:
             self.ExecuteOp(op, self.CurrentContext)
         except Exception as e:

prompt.py

@@ -22,7 +22,6 @@
 from neo.Wallets.KeyPair import KeyPair
 from neo.Network.NodeLeader import NodeLeader
 from neo.Prompt.Commands.Invoke import InvokeContract,TestInvokeContract,test_invoke,test_deploy_and_invoke
-#from neo.Prompt.Commands.BuildNRun import BuildAndRun,LoadAndRun
 from neo.Prompt.Commands.LoadSmartContract import LoadContract,GatherContractDetails,GatherLoadedContractParams
 from neo.Prompt.Utils import get_arg
 from neo.Prompt.Notify import SubscribeNotifications
@@ -41,7 +40,6 @@
 from prompt_toolkit.contrib.completers import WordCompleter
 from prompt_toolkit.history import InMemoryHistory
 
-#from boa.boa import Compiler
 
 logname = 'prompt.log'
 logging.basicConfig(
@@ -89,6 +87,7 @@ class PromptInterface(object):
     _wallet_send_tx = None
 
     _invoke_test_tx = None
+    _invoke_test_tx_fee = None
 
     Wallet = None
 
@@ -634,14 +633,17 @@ def load_smart_contract(self, args):
 
             if contract_script is not None:
 
-                tx, results = test_invoke(contract_script, self.Wallet, [])
+                tx, fee, results, num_ops = test_invoke(contract_script, self.Wallet, [])
 
                 if tx is not None and results is not None:
                     self._invoke_test_tx = tx
+                    self._invoke_test_tx_fee = fee
                     print("\n-------------------------------------------------------------------------------------------------------------------------------------")
                     print("Test deploy invoke successful")
+                    print("Total operations executed: %s " % num_ops)
                     print("Results %s " % [str(item) for item in results])
-                    print("Deploy Invoke TX gas cost: %s " % (int(tx.Gas.value / Fixed8.D)))
+                    print("Deploy Invoke TX gas cost: %s " % (tx.Gas.value / Fixed8.D))
+                    print("Deploy Invoke TX Fee: %s " % (fee.value / Fixed8.D))
                     print("-------------------------------------------------------------------------------------------------------------------------------------\n")
                     print("You may now deploy this contract on the blockchain by using the 'invoke' command with no arguments or type 'cancel' to cancel deploy\n")
                     return
@@ -652,21 +654,25 @@ def load_smart_contract(self, args):
 
     def test_invoke_contract(self, args):
         self._invoke_test_tx = None
+        self._invoke_test_tx_fee = None
 
         if not self.Wallet:
             print("please open a wallet")
             return
 
 
         if args and len(args) > 0:
-            tx, results = TestInvokeContract(self.Wallet, args)
+            tx, fee, results,num_ops = TestInvokeContract(self.Wallet, args)
 
             if tx is not None and results is not None:
                 self._invoke_test_tx = tx
+                self._invoke_test_tx_fee = fee
                 print("\n-------------------------------------------------------------------------------------------------------------------------------------")
                 print("Test invoke successful")
+                print("Total operations: %s " % num_ops)
                 print("Results %s " % [str(item) for item in results])
                 print("Invoke TX gas cost: %s " % (tx.Gas.value / Fixed8.D))
+                print("Invoke TX Fee: %s " % (fee.value / Fixed8.D))
                 print("-------------------------------------------------------------------------------------------------------------------------------------\n")
                 print("You may now invoke this on the blockchain by using the 'invoke' command with no arguments or type 'cancel' to cancel invoke\n")
                 return
@@ -682,9 +688,10 @@ def invoke_contract(self, args):
             print("Please test your invoke before deploying it with the 'testinvoke {contracthash} *args' command")
             return
 
-        result = InvokeContract(self.Wallet, self._invoke_test_tx)
+        result = InvokeContract(self.Wallet, self._invoke_test_tx, self._invoke_test_tx_fee)
 
         self._invoke_test_tx = None
+        self._invoke_test_tx_fee = None
         return
 
     def cancel_operations(self):