fix: concurrency conflict because of Memory Order in Nep6Wallet and S…

…QLiteWallet creation
neo-project · Oct 13, 2024 · 6098d88 · 6098d88
1 parent 6ce4633
commit 6098d88
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/Neo/Wallets/NEP6/NEP6Wallet.cs b/src/Neo/Wallets/NEP6/NEP6Wallet.cs
@@ -72,6 +72,7 @@ public NEP6Wallet(string path, string password, ProtocolSettings settings, strin
                 accounts = new Dictionary<UInt160, NEP6Account>();
                 extra = JToken.Null;
             }
+            Thread.MemoryBarrier();
         }
 
         /// <summary>
@@ -85,6 +86,7 @@ public NEP6Wallet(string path, string password, ProtocolSettings settings, JObje
         {
             this.password = password.ToSecureString();
             LoadFromJson(json, out Scrypt, out accounts, out extra);
+            Thread.MemoryBarrier();
         }
 
         private void LoadFromJson(JObject wallet, out ScryptParameters scrypt, out Dictionary<UInt160, NEP6Account> accounts, out JToken extra)
@@ -94,7 +96,6 @@ private void LoadFromJson(JObject wallet, out ScryptParameters scrypt, out Dicti
             scrypt = ScryptParameters.FromJson((JObject)wallet["scrypt"]);
             accounts = ((JArray)wallet["accounts"]).Select(p => NEP6Account.FromJson((JObject)p, this)).ToDictionary(p => p.ScriptHash);
             extra = wallet["extra"];
-            Thread.MemoryBarrier();
             if (!VerifyPasswordInternal(password.GetClearText()))
                 throw new InvalidOperationException("Wrong password.");
         }