Support #888

.travis.yml

@@ -21,7 +21,7 @@ install:
   - pip install coveralls
   - yes | pip uninstall neo-boa neocore
   - pip install -e git+https://github.com/CityOfZion/neo-boa@development#egg=neo-boa
-  - pip install -e git+https://github.com/CityOfZion/neo-python-core@master#egg=neocore
+  - pip install -e git+https://github.com/CityOfZion/neo-python-core@development#egg=neocore
 
 env:
   - NEOPYTHON_UNITTEST=1

CHANGELOG.rst

@@ -11,6 +11,7 @@ All notable changes to this project are documented in this file.
 - Support cancelling actions with ``KeyboardInterrupt``
 - Enhance output of `wallet` cli command
 - Fixed size calculation for `RegisterTransaction`
+- Support updating np-core to throw exceptions instead of logging errors `#888 <https://github.com/CityOfZion/neo-python/issues/888>`_
 
 
 [0.8.4] 2019-02-14

neo/Core/BlockBase.py

@@ -119,7 +119,7 @@ def Deserialize(self, reader):
         """
         self.__hash = None
         self.DeserializeUnsigned(reader)
-        byt = reader.ReadByte()
+        byt = ord(reader.ReadByte())
         if int(byt) != 1:
             raise Exception('Incorrect format')
 

neo/Core/FunctionCode.py

@@ -84,7 +84,7 @@ def Deserialize(self, reader):
         """
         self.Script = reader.ReadVarBytes()
         self.ParameterList = reader.ReadVarBytes()
-        self.ReturnType = reader.ReadByte()
+        self.ReturnType = ord(reader.ReadByte())
 
     def Serialize(self, writer):
         """

neo/Core/Header.py

@@ -36,7 +36,7 @@ def Deserialize(self, reader):
             reader (neo.IO.BinaryReader):
         """
         super(Header, self).Deserialize(reader)
-        if reader.ReadByte() != 0:
+        if ord(reader.ReadByte()) != 0:
             raise Exception('Incorrect Header Format')
 
     def Equals(self, other):

neo/Core/State/AssetState.py

@@ -103,19 +103,19 @@ def Deserialize(self, reader):
         """
         super(AssetState, self).Deserialize(reader)
         self.AssetId = reader.ReadUInt256()
-        self.AssetType = reader.ReadByte()
+        self.AssetType = ord(reader.ReadByte())
         self.Name = reader.ReadVarString()
 
         position = reader.stream.tell()
 
         try:
             self.Amount = reader.ReadFixed8()
-        except Exception as e:
+        except Exception:
             reader.stream.seek(position)
             self.Amount = reader.ReadFixed8()
 
         self.Available = reader.ReadFixed8()
-        self.Precision = reader.ReadByte()
+        self.Precision = ord(reader.ReadByte())
 
         # fee mode
         reader.ReadByte()

neo/Core/State/StateBase.py

@@ -36,7 +36,7 @@ def Deserialize(self, reader):
         Raises:
             Exception: if the state version is incorrect.
         """
-        sv = reader.ReadByte()
+        sv = ord(reader.ReadByte())
         if sv != self.StateVersion:
             raise Exception("Incorrect State format")
 

neo/Core/State/StateDescriptor.py

@@ -45,7 +45,7 @@ def Deserialize(self, reader: BinaryReader):
             reader (neocore.IO.BinaryReader):
         """
 
-        self.Type = StateType(reader.ReadByte())
+        self.Type = StateType(ord(reader.ReadByte()))
 
         self.Key = reader.ReadVarBytes(max=100)
         self.Field = reader.ReadVarString(max=32).decode('utf-8')

neo/Core/State/UnspentCoinState.py

@@ -84,7 +84,7 @@ def Deserialize(self, reader):
         blen = reader.ReadVarInt()
         self.Items = [0] * blen
         for i in range(0, blen):
-            self.Items[i] = int.from_bytes(reader.ReadByte(do_ord=False), 'little')
+            self.Items[i] = int.from_bytes(reader.ReadByte(), 'little')
 
     @staticmethod
     def DeserializeFromDB(buffer):

neo/Core/TX/RegisterTransaction.py

@@ -103,10 +103,10 @@ def DeserializeExclusiveData(self, reader):
             reader (neo.IO.BinaryReader):
         """
         self.Type = TransactionType.RegisterTransaction
-        self.AssetType = reader.ReadByte()
+        self.AssetType = ord(reader.ReadByte())
         self.Name = reader.ReadVarString()
         self.Amount = reader.ReadFixed8()
-        self.Precision = reader.ReadByte()
+        self.Precision = ord(reader.ReadByte())
         self.Owner = ECDSA.Deserialize_Secp256r1(reader)
         #        self.Owner = ecdsa.G
         self.Admin = reader.ReadUInt160()

neo/Core/TX/Transaction.py

@@ -441,7 +441,7 @@ def DeserializeFrom(reader):
         Returns:
             Transaction:
         """
-        ttype = reader.ReadByte()
+        ttype = ord(reader.ReadByte())
         tx = None
 
         from neo.Core.TX.RegisterTransaction import RegisterTransaction
@@ -499,7 +499,7 @@ def DeserializeUnsigned(self, reader):
         Raises:
             Exception: if transaction type is incorrect.
         """
-        txtype = reader.ReadByte()
+        txtype = ord(reader.ReadByte())
         if txtype != int.from_bytes(self.Type, 'little'):
             raise Exception('incorrect type {}, wanted {}'.format(txtype, int.from_bytes(self.Type, 'little')))
         self.DeserializeUnsignedWithoutType(reader)
@@ -511,7 +511,7 @@ def DeserializeUnsignedWithoutType(self, reader):
         Args:
             reader (neo.IO.BinaryReader):
         """
-        self.Version = reader.ReadByte()
+        self.Version = ord(reader.ReadByte())
         self.DeserializeExclusiveData(reader)
         self.Attributes = reader.ReadSerializableArray('neo.Core.TX.TransactionAttribute.TransactionAttribute',
                                                        max=self.MAX_TX_ATTRIBUTES)

neo/Core/TX/TransactionAttribute.py

@@ -84,7 +84,7 @@ def Deserialize(self, reader):
         Args:
             reader (neo.IO.BinaryReader):
         """
-        usage = reader.ReadByte()
+        usage = ord(reader.ReadByte())
         self.Usage = usage
 
         if usage == TransactionAttributeUsage.ContractHash or usage == TransactionAttributeUsage.Vote or \
@@ -99,7 +99,7 @@ def Deserialize(self, reader):
 
         elif usage == TransactionAttributeUsage.DescriptionUrl:
 
-            self.Data = reader.ReadBytes(reader.ReadByte())
+            self.Data = reader.ReadBytes(ord(reader.ReadByte()))
 
         elif usage == TransactionAttributeUsage.Description or usage >= TransactionAttributeUsage.Remark:
             self.Data = reader.ReadVarBytes(max=self.MAX_ATTR_DATA_SIZE)

neo/Network/Payloads/InvPayload.py

@@ -42,7 +42,7 @@ def Deserialize(self, reader):
         Args:
             reader (neo.IO.BinaryReader):
         """
-        self.Type = reader.ReadByte()
+        self.Type = ord(reader.ReadByte())
         self.Hashes = reader.ReadHashes()
 
     def Serialize(self, writer):

neo/Prompt/Commands/Invoke.py

@@ -660,6 +660,10 @@ def gather_signatures(context, itx, owners):
             else:
                 print("Public Key does not match address %s " % next_addr)
 
+        except ValueError:
+            # expected from ECDSA if public key is invalid
+            print(f"Invalid public key: {items[0]}")
+            do_exit = True
         except EOFError:
             # Control-D pressed: quit
             do_exit = True

neo/Prompt/Utils.py

@@ -329,7 +329,10 @@ def gather_param(index, param_type, do_continue=True):
         elif ptype == ContractParameterType.Boolean:
             return bool(result), False
         elif ptype == ContractParameterType.PublicKey:
-            return ECDSA.decode_secp256r1(result).G, False
+            try:
+                return ECDSA.decode_secp256r1(result).G, False
+            except ValueError:
+                return None, True
         elif ptype == ContractParameterType.ByteArray:
             if isinstance(result, str) and len(result) == 34 and result[0] == 'A':
                 return Helper.AddrStrToScriptHash(result).Data, False

neo/Prompt/test_utils.py

@@ -270,6 +270,13 @@ def test_gather_param(self):
             wallet = None
             os.remove(WalletFixtureTestCase.wallet_1_dest())
 
+        # test ContractParameterType.PublicKey with bad public key
+        with mock.patch('neo.Prompt.Utils.get_input_prompt', return_value="blah") as fake_prompt:
+
+            result, abort = Utils.gather_param(0, ContractParameterType.PublicKey)
+            self.assertIsNone(result)
+            self.assertTrue(abort)
+
         # test unknown ContractParameterType
         with mock.patch('neo.Prompt.Utils.get_input_prompt', return_value="9698b1cac6ce9cbe8517e490778525b929e01903") as fake_prompt:
 

neo/SmartContract/ContractParameterContext.py

@@ -165,10 +165,14 @@ def AddSignature(self, contract, pubkey, signature):
             ms = MemoryStream(binascii.unhexlify(contract.Script))
             reader = BinaryReader(ms)
             numr = reader.ReadUInt8()
-            while reader.ReadUInt8() == 33:
-                ecpoint = ecdsa.ec.decode_from_hex(binascii.hexlify(reader.ReadBytes(33)).decode())
-                points.append(ecpoint)
-            ms.close()
+            try:
+                while reader.ReadUInt8() == 33:
+                    ecpoint = ecdsa.ec.decode_from_hex(binascii.hexlify(reader.ReadBytes(33)).decode())
+                    points.append(ecpoint)
+            except ValueError:
+                return False
+            finally:
+                ms.close()
 
             if pubkey not in points:
                 return False

neo/SmartContract/StateMachine.py

@@ -146,7 +146,10 @@ def Asset_Create(self, engine: ExecutionEngine):
 
         ownerData = engine.CurrentContext.EvaluationStack.Pop().GetByteArray()
 
-        owner = ECDSA.decode_secp256r1(ownerData, unhex=False).G
+        try:
+            owner = ECDSA.decode_secp256r1(ownerData, unhex=False).G
+        except ValueError:
+            return False
 
         if owner.IsInfinity:
             return False

neo/SmartContract/StateReader.py

@@ -346,7 +346,10 @@ def Runtime_CheckWitness(self, engine: ExecutionEngine):
             result = self.CheckWitnessHash(engine, UInt160(data=hashOrPubkey))
 
         elif len(hashOrPubkey) == 33:
-            point = ECDSA.decode_secp256r1(hashOrPubkey, unhex=False).G
+            try:
+                point = ECDSA.decode_secp256r1(hashOrPubkey, unhex=False).G
+            except ValueError:
+                return False
             result = self.CheckWitnessPubkey(engine, point)
         else:
             return False

neo/VM/ExecutionEngine.py

@@ -160,7 +160,7 @@ def ExecuteOp(self, opcode, context: ExecutionContext):
                 estack.PushT(bytearray(0))
 
             elif opcode == PUSHDATA1:
-                lenngth = context.OpReader.ReadByte()
+                lenngth = ord(context.OpReader.ReadByte())
                 estack.PushT(bytearray(context.OpReader.SafeReadBytes(lenngth)))
             elif opcode == PUSHDATA2:
                 estack.PushT(context.OpReader.SafeReadBytes(context.OpReader.ReadUInt16()))
@@ -887,8 +887,8 @@ def ExecuteOp(self, opcode, context: ExecutionContext):
 
             # stack isolation
             elif opcode == CALL_I:
-                rvcount = context.OpReader.ReadByte()
-                pcount = context.OpReader.ReadByte()
+                rvcount = ord(context.OpReader.ReadByte())
+                pcount = ord(context.OpReader.ReadByte())
 
                 if estack.Count < pcount:
                     return self.VM_FAULT_and_report(VMFault.UNKNOWN_STACKISOLATION)
@@ -906,8 +906,8 @@ def ExecuteOp(self, opcode, context: ExecutionContext):
                 if self._Table is None:
                     return self.VM_FAULT_and_report(VMFault.UNKNOWN_STACKISOLATION2)
 
-                rvcount = context.OpReader.ReadByte()
-                pcount = context.OpReader.ReadByte()
+                rvcount = ord(context.OpReader.ReadByte())
+                pcount = ord(context.OpReader.ReadByte())
 
                 if estack.Count < pcount:
                     return self.VM_FAULT_and_report(VMFault.UNKNOWN_STACKISOLATION)
@@ -998,7 +998,7 @@ def StepInto(self):
         if self.CurrentContext.InstructionPointer >= len(self.CurrentContext.Script):
             op = RET
         else:
-            op = self.CurrentContext.OpReader.ReadByte(do_ord=False)
+            op = self.CurrentContext.OpReader.ReadByte()
 
         self.ops_processed += 1
 

neo/VM/InteropService.py

@@ -81,7 +81,7 @@ def DeserializeStackItem(reader):
         if stype == StackItemType.ByteArray:
             return ByteArray(reader.ReadVarBytes())
         elif stype == StackItemType.Boolean:
-            return Boolean(reader.ReadByte())
+            return Boolean(ord(reader.ReadByte()))
         elif stype == StackItemType.Integer:
             return Integer(BigInteger.FromBytes(reader.ReadVarBytes(), signed=True))
         elif stype == StackItemType.Array: