Sync neo changes

src/Neo.SmartContract.Framework/UInt160.cs

@@ -13,6 +13,26 @@ public extern bool IsZero
             get;
         }
 
+        public extern int Size
+        {
+            [OpCode(OpCode.SIZE)]
+            get;
+        }
+
+        public extern bool IsValid
+        {
+            [OpCode(OpCode.DUP)]
+            [OpCode(OpCode.ISNULL)]
+            [OpCode(OpCode.JMPIF, "0x08")]
+            [OpCode(OpCode.SIZE)]
+            [OpCode(OpCode.PUSHINT8, "14")] // 0x14 == 20 bytes expected array size
+            [OpCode(OpCode.NUMEQUAL)]
+            [OpCode(OpCode.JMP, "0x04")]
+            [OpCode(OpCode.DROP)]
+            [OpCode(OpCode.PUSH0)]
+            get;
+        }
+
         [OpCode(OpCode.CONVERT, StackItemType.ByteString)]
         [OpCode(OpCode.DUP)]
         [OpCode(OpCode.SIZE)]

src/Neo.SmartContract.Framework/UInt256.cs

@@ -13,6 +13,26 @@ public extern bool IsZero
             get;
         }
 
+        public extern int Size
+        {
+            [OpCode(OpCode.SIZE)]
+            get;
+        }
+
+        public extern bool IsValid
+        {
+            [OpCode(OpCode.DUP)]
+            [OpCode(OpCode.ISNULL)]
+            [OpCode(OpCode.JMPIF, "0x08")]
+            [OpCode(OpCode.SIZE)]
+            [OpCode(OpCode.PUSHINT8, "20")] // 0x20 == 32 bytes expected array size
+            [OpCode(OpCode.NUMEQUAL)]
+            [OpCode(OpCode.JMP, "0x04")]
+            [OpCode(OpCode.DROP)]
+            [OpCode(OpCode.PUSH0)]
+            get;
+        }
+
         [OpCode(OpCode.CONVERT, StackItemType.ByteString)]
         [OpCode(OpCode.DUP)]
         [OpCode(OpCode.SIZE)]

templates/Template.NEP17.CSharp/NEP17.Helpers.cs

@@ -6,7 +6,7 @@ namespace Template.NEP17.CSharp
 {
     public partial class NEP17 : SmartContract
     {
-        private static bool ValidateAddress(UInt160 address) => !address.IsZero;
+        private static bool ValidateAddress(UInt160 address) => address.IsValid && !address.IsZero;
         private static bool IsDeployed(UInt160 address) => Blockchain.GetContract(address) != null;
     }
 }

tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract_UIntTypes.cs

@@ -9,5 +9,7 @@ class Contract_UIntTypes : SmartContract.Framework.SmartContract
         public static bool checkZeroStatic(UInt160 owner) { return owner == UInt160.Zero; }
 
         public static UInt160 constructUInt160(byte[] bytes) { return (UInt160)bytes; }
+
+        public static bool validateAddress(UInt160 address) => address.IsValid && !address.IsZero;
     }
 }

tests/Neo.Compiler.MSIL.UnitTests/UnitTest_Types.cs

@@ -1,10 +1,10 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Neo.Compiler.MSIL.UnitTests.Utils;
 using Neo.IO;
-using Neo.VM;
 using Neo.VM.Types;
 using Neo.Wallets;
 using System.Linq;
+using System.Numerics;
 
 namespace Neo.Compiler.MSIL.UnitTests
 {
@@ -193,8 +193,8 @@ public void byteArray_Test()
             var result = testengine.ExecuteTestCaseStandard("checkByteArray");
 
             var item = result.Pop();
-            Assert.IsInstanceOfType(item, typeof(Buffer));
-            CollectionAssert.AreEqual(new byte[] { 1, 2, 3 }, ((Buffer)item).GetSpan().ToArray());
+            Assert.IsInstanceOfType(item, typeof(VM.Types.Buffer));
+            CollectionAssert.AreEqual(new byte[] { 1, 2, 3 }, ((VM.Types.Buffer)item).GetSpan().ToArray());
         }
 
         [TestMethod]
@@ -229,9 +229,9 @@ public void arrayObj_Test()
             var result = testengine.ExecuteTestCaseStandard("checkArrayObj");
 
             var item = result.Pop();
-            Assert.IsInstanceOfType(item, typeof(Array));
-            Assert.AreEqual(1, ((Array)item).Count);
-            Assert.AreEqual("neo", (((Array)item)[0] as ByteString).GetString());
+            Assert.IsInstanceOfType(item, typeof(VM.Types.Array));
+            Assert.AreEqual(1, ((VM.Types.Array)item).Count);
+            Assert.AreEqual("neo", (((VM.Types.Array)item)[0] as ByteString).GetString());
         }
 
         [TestMethod]
@@ -254,9 +254,9 @@ public void class_Test()
             var result = testengine.ExecuteTestCaseStandard("checkClass");
 
             var item = result.Pop();
-            Assert.IsInstanceOfType(item, typeof(Array));
-            Assert.AreEqual(1, ((Array)item).Count);
-            Assert.AreEqual("neo", (((Array)item)[0] as ByteString).GetString());
+            Assert.IsInstanceOfType(item, typeof(VM.Types.Array));
+            Assert.AreEqual(1, ((VM.Types.Array)item).Count);
+            Assert.AreEqual("neo", (((VM.Types.Array)item)[0] as ByteString).GetString());
         }
 
         [TestMethod]
@@ -280,10 +280,10 @@ public void tuple_Test()
             var result = testengine.ExecuteTestCaseStandard("checkTuple");
 
             var item = result.Pop();
-            Assert.IsInstanceOfType(item, typeof(Array));
-            Assert.AreEqual(2, ((Array)item).Count);
-            Assert.AreEqual("neo", (((Array)item)[0] as ByteString).GetString());
-            Assert.AreEqual("smart economy", (((Array)item)[1] as ByteString).GetString());
+            Assert.IsInstanceOfType(item, typeof(VM.Types.Array));
+            Assert.AreEqual(2, ((VM.Types.Array)item).Count);
+            Assert.AreEqual("neo", (((VM.Types.Array)item)[0] as ByteString).GetString());
+            Assert.AreEqual("smart economy", (((VM.Types.Array)item)[1] as ByteString).GetString());
         }
 
         [TestMethod]
@@ -294,10 +294,10 @@ public void tuple2_Test()
             var result = testengine.ExecuteTestCaseStandard("checkTuple2");
 
             var item = result.Pop();
-            Assert.IsInstanceOfType(item, typeof(Array));
-            Assert.AreEqual(2, ((Array)item).Count);
-            Assert.AreEqual("neo", (((Array)item)[0] as ByteString).GetString());
-            Assert.AreEqual("smart economy", (((Array)item)[1] as ByteString).GetString());
+            Assert.IsInstanceOfType(item, typeof(VM.Types.Array));
+            Assert.AreEqual(2, ((VM.Types.Array)item).Count);
+            Assert.AreEqual("neo", (((VM.Types.Array)item)[0] as ByteString).GetString());
+            Assert.AreEqual("smart economy", (((VM.Types.Array)item)[1] as ByteString).GetString());
         }
 
         [TestMethod]
@@ -308,10 +308,10 @@ public void tuple3_Test()
             var result = testengine.ExecuteTestCaseStandard("checkTuple3");
 
             var item = result.Pop();
-            Assert.IsInstanceOfType(item, typeof(Array));
-            Assert.AreEqual(2, ((Array)item).Count);
-            Assert.AreEqual("neo", (((Array)item)[0] as ByteString).GetString());
-            Assert.AreEqual("smart economy", (((Array)item)[1] as ByteString).GetString());
+            Assert.IsInstanceOfType(item, typeof(VM.Types.Array));
+            Assert.AreEqual(2, ((VM.Types.Array)item).Count);
+            Assert.AreEqual("neo", (((VM.Types.Array)item)[0] as ByteString).GetString());
+            Assert.AreEqual("smart economy", (((VM.Types.Array)item)[1] as ByteString).GetString());
         }
 
         [TestMethod]
@@ -354,6 +354,72 @@ public void delegate_Test()
             Assert.IsInstanceOfType(item, typeof(Pointer));
         }
 
+        [TestMethod]
+        public void UInt160_ValidateAddress()
+        {
+            var address = "NiNmXL8FjEUEs1nfX9uHFBNaenxDHJtmuB".ToScriptHash();
+
+            var testengine = new TestEngine();
+            testengine.AddEntryScript("./TestClasses/Contract_UIntTypes.cs");
+
+            // True
+
+            var result = testengine.ExecuteTestCaseStandard("validateAddress", address.ToArray());
+            Assert.AreEqual(1, result.Count);
+            var item = result.Pop();
+            Assert.IsTrue(item.GetBoolean());
+
+            testengine.Reset();
+            result = testengine.ExecuteTestCaseStandard("validateAddress", new ByteString(address.ToArray()));
+            Assert.AreEqual(1, result.Count);
+            item = result.Pop();
+            Assert.IsTrue(item.GetBoolean());
+
+            // False
+
+            testengine.Reset();
+            result = testengine.ExecuteTestCaseStandard("validateAddress", new byte[1] { 1 }.Concat(address.ToArray()).ToArray());
+            Assert.AreEqual(1, result.Count);
+            item = result.Pop();
+            Assert.IsFalse(item.GetBoolean());
+
+            testengine.Reset();
+            result = testengine.ExecuteTestCaseStandard("validateAddress", BigInteger.One);
+            Assert.AreEqual(1, result.Count);
+            item = result.Pop();
+            Assert.IsFalse(item.GetBoolean());
+
+            testengine.Reset();
+            result = testengine.ExecuteTestCaseStandard("validateAddress", StackItem.Null);
+            Assert.AreEqual(1, result.Count);
+            item = result.Pop();
+            Assert.IsFalse(item.GetBoolean());
+
+            testengine.Reset();
+            result = testengine.ExecuteTestCaseStandard("validateAddress", new VM.Types.Array());
+            Assert.AreEqual(1, result.Count);
+            item = result.Pop();
+            Assert.IsFalse(item.GetBoolean());
+
+            testengine.Reset();
+            result = testengine.ExecuteTestCaseStandard("validateAddress", new Struct());
+            Assert.AreEqual(1, result.Count);
+            item = result.Pop();
+            Assert.IsFalse(item.GetBoolean());
+
+            testengine.Reset();
+            result = testengine.ExecuteTestCaseStandard("validateAddress", new Map());
+            Assert.AreEqual(1, result.Count);
+            item = result.Pop();
+            Assert.IsFalse(item.GetBoolean());
+
+            testengine.Reset();
+            result = testengine.ExecuteTestCaseStandard("validateAddress", new VM.Types.Boolean(true));
+            Assert.AreEqual(1, result.Count);
+            item = result.Pop();
+            Assert.IsFalse(item.GetBoolean());
+        }
+
         [TestMethod]
         public void UInt160_equals_test()
         {