Merge branch 'master' into fixes/syscalls

neo-project · Apr 8, 2020 · 8d2d524 · 8d2d524
2 parents 9acce87 + 2fad68a
commit 8d2d524
Show file tree

Hide file tree

Showing 22 changed files with 212 additions and 223 deletions.
diff --git a/src/neo/SmartContract/BinarySerializer.cs b/src/neo/SmartContract/BinarySerializer.cs
@@ -50,7 +50,7 @@ private static StackItem Deserialize(BinaryReader reader, uint maxArraySize, uin
                     case StackItemType.Integer:
                         deserialized.Push(new BigInteger(reader.ReadVarBytes(Integer.MaxSize)));
                         break;
-                    case StackItemType.ByteArray:
+                    case StackItemType.ByteString:
                         deserialized.Push(reader.ReadVarBytes((int)maxItemSize));
                         break;
                     case StackItemType.Buffer:
@@ -142,7 +142,7 @@ private static void Serialize(StackItem item, BinaryWriter writer, uint maxSize)
                     case Integer integer:
                         writer.WriteVarBytes(integer.Span);
                         break;
-                    case ByteArray bytes:
+                    case ByteString bytes:
                         writer.WriteVarBytes(bytes.Span);
                         break;
                     case Buffer buffer:

diff --git a/src/neo/SmartContract/JsonSerializer.cs b/src/neo/SmartContract/JsonSerializer.cs
@@ -27,7 +27,7 @@ public static JObject Serialize(StackItem item)
                     {
                         return array.Select(p => Serialize(p)).ToArray();
                     }
-                case ByteArray buffer:
+                case ByteString buffer:
                     {
                         return Convert.ToBase64String(buffer.GetSpan());
                     }
@@ -87,7 +87,7 @@ public static byte[] SerializeToByteArray(StackItem item, uint maxSize)
                     case JsonTokenType.EndArray:
                         writer.WriteEndArray();
                         break;
-                    case ByteArray buffer:
+                    case ByteString buffer:
                         writer.WriteStringValue(Convert.ToBase64String(buffer.GetSpan()));
                         break;
                     case Integer num:

diff --git a/src/neo/VM/Helper.cs b/src/neo/VM/Helper.cs
@@ -261,7 +261,7 @@ private static ContractParameter ToParameter(StackItem item, List<(StackItem, Co
                         Value = item.ToBoolean()
                     };
                     break;
-                case ByteArray array:
+                case ByteString array:
                     parameter = new ContractParameter
                     {
                         Type = ContractParameterType.ByteArray,

diff --git a/src/neo/Wallets/NEP6/NEP6Account.cs b/src/neo/Wallets/NEP6/NEP6Account.cs
@@ -1,12 +1,14 @@
 using Neo.IO.Json;
 using System;
+using System.Threading;
 
 namespace Neo.Wallets.NEP6
 {
     internal class NEP6Account : WalletAccount
     {
         private readonly NEP6Wallet wallet;
-        private readonly string nep2key;
+        private string nep2key;
+        private string nep2KeyNew = null;
         private KeyPair key;
         public JObject Extra;
 
@@ -83,5 +85,47 @@ public bool VerifyPassword(string password)
                 return false;
             }
         }
+
+        /// <summary>
+        /// Cache draft nep2key during wallet password changing process. Should not be called alone for a single account
+        /// </summary>
+        internal bool ChangePasswordPrepare(string password_old, string password_new)
+        {
+            if (WatchOnly) return true;
+            KeyPair keyTemplate = key;
+            if (nep2key == null)
+            {
+                if (keyTemplate == null)
+                {
+                    return true;
+                }
+            }
+            else
+            {
+                try
+                {
+                    keyTemplate = new KeyPair(Wallet.GetPrivateKeyFromNEP2(nep2key, password_old, wallet.Scrypt.N, wallet.Scrypt.R, wallet.Scrypt.P));
+                }
+                catch
+                {
+                    return false;
+                }
+            }
+            nep2KeyNew = keyTemplate.Export(password_new, wallet.Scrypt.N, wallet.Scrypt.R, wallet.Scrypt.P);
+            return true;
+        }
+
+        internal void ChangePasswordCommit()
+        {
+            if (nep2KeyNew != null)
+            {
+                nep2key = Interlocked.Exchange(ref nep2KeyNew, null);
+            }
+        }
+
+        internal void ChangePasswordRoolback()
+        {
+            nep2KeyNew = null;
+        }
     }
 }
diff --git a/src/neo/Wallets/NEP6/NEP6Wallet.cs b/src/neo/Wallets/NEP6/NEP6Wallet.cs
@@ -6,6 +6,7 @@
 using System.Linq;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
+using System.Threading.Tasks;
 using UserWallet = Neo.Wallets.SQLite.UserWallet;
 
 namespace Neo.Wallets.NEP6
@@ -300,5 +301,34 @@ public override bool VerifyPassword(string password)
                 }
             }
         }
+
+        public bool ChangePassword(string password_old, string password_new)
+        {
+            bool succeed = true;
+            lock (accounts)
+            {
+                Parallel.ForEach(accounts.Values, (account, state) =>
+                {
+                    if (!account.ChangePasswordPrepare(password_old, password_new))
+                    {
+                        state.Stop();
+                        succeed = false;
+                    }
+                });
+            }
+            if (succeed)
+            {
+                foreach (NEP6Account account in accounts.Values)
+                    account.ChangePasswordCommit();
+                if (password != null)
+                    password = password_new;
+            }
+            else
+            {
+                foreach (NEP6Account account in accounts.Values)
+                    account.ChangePasswordRoolback();
+            }
+            return succeed;
+        }
     }
 }
diff --git a/src/neo/neo.csproj b/src/neo/neo.csproj
@@ -21,13 +21,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Akka" Version="1.3.16" />
+    <PackageReference Include="Akka" Version="1.4.2" />
     <PackageReference Include="K4os.Compression.LZ4" Version="1.1.11" />
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="2.2.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.0.1" />
-    <PackageReference Include="Neo.VM" Version="3.0.0-CI00211" />
+    <PackageReference Include="Neo.VM" Version="3.0.0-CI00214" />
   </ItemGroup>
 
 </Project>
diff --git a/tests/neo.UnitTests/Extensions/Nep5NativeContractExtensions.cs b/tests/neo.UnitTests/Extensions/Nep5NativeContractExtensions.cs
@@ -166,7 +166,7 @@ public static string Symbol(this NativeContract contract)
             engine.Execute().Should().Be(VMState.HALT);
 
             var result = engine.ResultStack.Pop();
-            result.Should().BeOfType(typeof(VM.Types.ByteArray));
+            result.Should().BeOfType(typeof(VM.Types.ByteString));
 
             return result.GetString();
         }
@@ -186,7 +186,7 @@ public static string Name(this NativeContract contract)
             engine.Execute().Should().Be(VMState.HALT);
 
             var result = engine.ResultStack.Pop();
-            result.Should().BeOfType(typeof(VM.Types.ByteArray));
+            result.Should().BeOfType(typeof(VM.Types.ByteString));
 
             return result.GetString();
         }

diff --git a/tests/neo.UnitTests/Network/P2P/UT_RemoteNode.cs b/tests/neo.UnitTests/Network/P2P/UT_RemoteNode.cs
@@ -9,7 +9,6 @@
 namespace Neo.UnitTests.Network.P2P
 {
     [TestClass]
-    [NotReRunnable]
     public class UT_RemoteNode : TestKit
     {
         private static NeoSystem testBlockchain;

diff --git a/tests/neo.UnitTests/Network/P2P/UT_RemoteNodeMailbox.cs b/tests/neo.UnitTests/Network/P2P/UT_RemoteNodeMailbox.cs
@@ -8,7 +8,6 @@
 namespace Neo.UnitTests.Network.P2P
 {
     [TestClass]
-    [NotReRunnable]
     public class UT_RemoteNodeMailbox : TestKit
     {
         private static readonly Random TestRandom = new Random(1337); // use fixed seed for guaranteed determinism

diff --git a/tests/neo.UnitTests/SmartContract/Iterators/UT_PrimitiveWrapper.cs b/tests/neo.UnitTests/SmartContract/Iterators/UT_PrimitiveWrapper.cs
@@ -13,7 +13,7 @@ public class UT_PrimitiveWrapper
         [TestMethod]
         public void TestGeneratorAndDispose()
         {
-            ByteArrayWrapper arrayWrapper = new ByteArrayWrapper(new ByteArray(new byte[0]));
+            ByteArrayWrapper arrayWrapper = new ByteArrayWrapper(new ByteString(new byte[0]));
             Assert.IsNotNull(arrayWrapper);
             Action action = () => arrayWrapper.Dispose();
             action.Should().NotThrow<Exception>();

diff --git a/tests/neo.UnitTests/SmartContract/Iterators/UT_StorageIterator.cs b/tests/neo.UnitTests/SmartContract/Iterators/UT_StorageIterator.cs
@@ -31,8 +31,8 @@ public void TestKeyAndValueAndNext()
             list.Add((storageKey, storageItem));
             StorageIterator storageIterator = new StorageIterator(list.GetEnumerator());
             storageIterator.Next();
-            Assert.AreEqual(new ByteArray(new byte[1]), storageIterator.Key());
-            Assert.AreEqual(new ByteArray(new byte[1]), storageIterator.Value());
+            Assert.AreEqual(new ByteString(new byte[1]), storageIterator.Key());
+            Assert.AreEqual(new ByteString(new byte[1]), storageIterator.Value());
         }
     }
 }
diff --git a/tests/neo.UnitTests/SmartContract/Native/Tokens/UT_NeoToken.cs b/tests/neo.UnitTests/SmartContract/Native/Tokens/UT_NeoToken.cs
@@ -690,7 +690,7 @@ internal static void CheckBalance(byte[] account, DataCache<StorageKey, StorageI
             var st = (VM.Types.Struct)BinarySerializer.Deserialize(trackable.Item.Value, 16, 32);
 
             st.Count.Should().Be(3);
-            st.Select(u => u.GetType()).ToArray().Should().BeEquivalentTo(new Type[] { typeof(VM.Types.Integer), typeof(VM.Types.Integer), typeof(VM.Types.ByteArray) }); // Balance
+            st.Select(u => u.GetType()).ToArray().Should().BeEquivalentTo(new Type[] { typeof(VM.Types.Integer), typeof(VM.Types.Integer), typeof(VM.Types.ByteString) }); // Balance
 
             st[0].GetBigInteger().Should().Be(balance); // Balance
             st[1].GetBigInteger().Should().Be(height);  // BalanceHeight

diff --git a/tests/neo.UnitTests/SmartContract/Native/UT_NativeContract.cs b/tests/neo.UnitTests/SmartContract/Native/UT_NativeContract.cs
@@ -49,13 +49,13 @@ public void TestInvoke()
             sb2.EmitSysCall("test".ToInteropMethodHash());
             engine2.LoadScript(sb2.ToArray());
 
-            ByteArray method1 = new ByteArray(System.Text.Encoding.Default.GetBytes("wrongMethod"));
+            ByteString method1 = new ByteString(System.Text.Encoding.Default.GetBytes("wrongMethod"));
             VMArray args1 = new VMArray();
             engine2.CurrentContext.EvaluationStack.Push(args1);
             engine2.CurrentContext.EvaluationStack.Push(method1);
             testNativeContract.Invoke(engine2).Should().BeFalse();
 
-            ByteArray method2 = new ByteArray(System.Text.Encoding.Default.GetBytes("onPersist"));
+            ByteString method2 = new ByteString(System.Text.Encoding.Default.GetBytes("onPersist"));
             VMArray args2 = new VMArray();
             engine2.CurrentContext.EvaluationStack.Push(args2);
             engine2.CurrentContext.EvaluationStack.Push(method2);

diff --git a/tests/neo.UnitTests/SmartContract/UT_BinarySerializer.cs b/tests/neo.UnitTests/SmartContract/UT_BinarySerializer.cs
@@ -76,7 +76,7 @@ public void TestSerialize()
         [TestMethod]
         public void TestDeserializeStackItem()
         {
-            StackItem stackItem1 = new ByteArray(new byte[5]);
+            StackItem stackItem1 = new ByteString(new byte[5]);
             byte[] byteArray1 = BinarySerializer.Serialize(stackItem1, MaxItemSize);
             StackItem result1 = BinarySerializer.Deserialize(byteArray1, 2048, (uint)byteArray1.Length);
             Assert.AreEqual(stackItem1, result1);

diff --git a/tests/neo.UnitTests/SmartContract/UT_InteropService.cs b/tests/neo.UnitTests/SmartContract/UT_InteropService.cs
@@ -471,7 +471,7 @@ public void TestBlockchain_GetContract()
             InteropService.Invoke(engine, InteropService.Blockchain.GetContract).Should().BeTrue();
             var stackItems = ((VM.Types.Array)engine.CurrentContext.EvaluationStack.Pop()).ToArray();
             stackItems.Length.Should().Be(3);
-            stackItems[0].GetType().Should().Be(typeof(ByteArray));
+            stackItems[0].GetType().Should().Be(typeof(ByteString));
             stackItems[0].GetSpan().ToHexString().Should().Be(state.Script.ToHexString());
             stackItems[1].ToBoolean().Should().BeFalse();
             stackItems[2].ToBoolean().Should().BeFalse();

diff --git a/tests/neo.UnitTests/SmartContract/UT_Syscalls.cs b/tests/neo.UnitTests/SmartContract/UT_Syscalls.cs
@@ -95,7 +95,7 @@ public void System_Blockchain_GetBlock()
 
                 Assert.AreEqual(engine.Execute(), VMState.HALT);
                 Assert.AreEqual(1, engine.ResultStack.Count);
-                Assert.IsInstanceOfType(engine.ResultStack.Peek(), typeof(ByteArray));
+                Assert.IsInstanceOfType(engine.ResultStack.Peek(), typeof(ByteString));
                 Assert.AreEqual(engine.ResultStack.Pop().GetSpan().ToHexString(),
                     "5b22366b4139757552614430373634585358466c706674686b436b5954702f6e34623878715057476c6a6659303d222c332c22414141414141414141414141414141414141414141414141414141414141414141414141414141414141413d222c22414141414141414141414141414141414141414141414141414141414141414141414141414141414141413d222c322c302c224141414141414141414141414141414141414141414141414141413d222c315d");
                 Assert.AreEqual(0, engine.ResultStack.Count);
@@ -194,11 +194,11 @@ public void Json_Serialize()
                     Assert.AreEqual(engine.Execute(), VMState.HALT);
                     Assert.AreEqual(5, engine.ResultStack.Count);
 
-                    Assert.IsTrue(engine.ResultStack.TryPop<ByteArray>(out var m) && m.GetString() == "{\"key\":\"dmFsdWU=\"}");
-                    Assert.IsTrue(engine.ResultStack.TryPop<ByteArray>(out var n) && n.GetString() == "null");
-                    Assert.IsTrue(engine.ResultStack.TryPop<ByteArray>(out var s) && s.GetString() == "\"dGVzdA==\"");
-                    Assert.IsTrue(engine.ResultStack.TryPop<ByteArray>(out var b) && b.GetString() == "true");
-                    Assert.IsTrue(engine.ResultStack.TryPop<ByteArray>(out var i) && i.GetString() == "5");
+                    Assert.IsTrue(engine.ResultStack.TryPop<ByteString>(out var m) && m.GetString() == "{\"key\":\"dmFsdWU=\"}");
+                    Assert.IsTrue(engine.ResultStack.TryPop<ByteString>(out var n) && n.GetString() == "null");
+                    Assert.IsTrue(engine.ResultStack.TryPop<ByteString>(out var s) && s.GetString() == "\"dGVzdA==\"");
+                    Assert.IsTrue(engine.ResultStack.TryPop<ByteString>(out var b) && b.GetString() == "true");
+                    Assert.IsTrue(engine.ResultStack.TryPop<ByteString>(out var i) && i.GetString() == "5");
                 }
             }
 
@@ -259,7 +259,7 @@ public void System_ExecutionEngine_GetScriptContainer()
 
                 Assert.AreEqual(engine.Execute(), VMState.HALT);
                 Assert.AreEqual(1, engine.ResultStack.Count);
-                Assert.IsInstanceOfType(engine.ResultStack.Peek(), typeof(ByteArray));
+                Assert.IsInstanceOfType(engine.ResultStack.Peek(), typeof(ByteString));
                 Assert.AreEqual(engine.ResultStack.Pop().GetSpan().ToHexString(),
                     @"5b225c75303032426b53415959527a4c4b69685a676464414b50596f754655737a63544d7867445a6572584a3172784c37303d222c362c342c222f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f383d222c332c322c352c2241513d3d225d");
                 Assert.AreEqual(0, engine.ResultStack.Count);