NEP-6 (#106)

neo-project · Dec 12, 2017 · ae3605e · ae3605e
1 parent 01ce716
commit ae3605e
Show file tree

Hide file tree

Showing 42 changed files with 480 additions and 1,255 deletions.
diff --git a/neo-gui/Program.cs b/neo-gui/Program.cs
@@ -1,9 +1,9 @@
 using Neo.Core;
 using Neo.Implementations.Blockchains.LevelDB;
-using Neo.Implementations.Wallets.EntityFramework;
 using Neo.Network;
 using Neo.Properties;
 using Neo.UI;
+using Neo.Wallets;
 using System;
 using System.ComponentModel;
 using System.Diagnostics;
@@ -19,7 +19,7 @@ namespace Neo
     internal static class Program
     {
         public static LocalNode LocalNode;
-        public static UserWallet CurrentWallet;
+        public static Wallet CurrentWallet;
         public static MainForm MainForm;
 
         private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)

diff --git a/neo-gui/Properties/AssemblyInfo.cs b/neo-gui/Properties/AssemblyInfo.cs
@@ -30,6 +30,6 @@
 //
 // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: 
-[assembly: AssemblyVersion("2.4.*")]
+[assembly: AssemblyVersion("2.5.*")]
 //[assembly: AssemblyVersion("1.0.0.0")]
 //[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/neo-gui/Properties/Strings.Designer.cs b/neo-gui/Properties/Strings.Designer.cs
diff --git a/neo-gui/Properties/Strings.es-Es.resx b/neo-gui/Properties/Strings.es-Es.resx
@@ -193,9 +193,6 @@
     <value>Abriendo ficheros de monederos antiguos, actualizar al nuevo formato?
 Aviso: los ficheros actualizados no podran ser abiertos por clientes de versiones antiguas.</value>
   </data>
-  <data name="MigrateWalletSucceedMessage" xml:space="preserve">
-    <value>Ficheros de monederos realojados. Los ficheros antiguos se guardaron automáticamente en:</value>
-  </data>
   <data name="PasswordIncorrect" xml:space="preserve">
     <value>Contraseña incorrecta</value>
   </data>

diff --git a/neo-gui/Properties/Strings.resx b/neo-gui/Properties/Strings.resx
@@ -194,7 +194,7 @@
 Note: updated files cannot be openned by clients in older versions!</value>
   </data>
   <data name="MigrateWalletSucceedMessage" xml:space="preserve">
-    <value>Wallet files relocated. Old files have been auto-saved at: </value>
+    <value>Wallet file relocated. New wallet file has been saved at: </value>
   </data>
   <data name="PasswordIncorrect" xml:space="preserve">
     <value>Password Incorrect</value>

diff --git a/neo-gui/Properties/Strings.zh-Hans.resx b/neo-gui/Properties/Strings.zh-Hans.resx
@@ -194,7 +194,7 @@
 注意，升级后将无法用旧版本的客户端打开该文件！</value>
   </data>
   <data name="MigrateWalletSucceedMessage" xml:space="preserve">
-    <value>钱包文件迁移成功，旧的文件已经自动保存到以下位置：</value>
+    <value>钱包文件迁移成功，新的钱包文件已经自动保存到以下位置：</value>
   </data>
   <data name="PasswordIncorrect" xml:space="preserve">
     <value>密码错误！</value>

diff --git a/neo-gui/UI/AssetRegisterDialog.cs b/neo-gui/UI/AssetRegisterDialog.cs
@@ -47,9 +47,9 @@ public InvocationTransaction GetTransaction()
         private void AssetRegisterDialog_Load(object sender, EventArgs e)
         {
             comboBox1.Items.AddRange(new object[] { AssetType.Share, AssetType.Token });
-            comboBox2.Items.AddRange(Program.CurrentWallet.GetContracts().Where(p => p.IsStandard).Select(p => Program.CurrentWallet.GetKey(p.PublicKeyHash).PublicKey).ToArray());
-            comboBox3.Items.AddRange(Program.CurrentWallet.GetContracts().Select(p => p.Address).ToArray());
-            comboBox4.Items.AddRange(Program.CurrentWallet.GetContracts().Select(p => p.Address).ToArray());
+            comboBox2.Items.AddRange(Program.CurrentWallet.GetAccounts().Where(p => !p.WatchOnly && p.Contract.IsStandard).Select(p => p.GetKey().PublicKey).ToArray());
+            comboBox3.Items.AddRange(Program.CurrentWallet.GetAccounts().Where(p => !p.WatchOnly).Select(p => p.Address).ToArray());
+            comboBox4.Items.AddRange(Program.CurrentWallet.GetAccounts().Where(p => !p.WatchOnly).Select(p => p.Address).ToArray());
         }
 
         private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)

diff --git a/neo-gui/UI/CertificateRequestWizard.cs b/neo-gui/UI/CertificateRequestWizard.cs
@@ -1,6 +1,5 @@
-using Neo.Cryptography.ECC;
+using CERTENROLLLib;
 using Neo.Wallets;
-using CERTENROLLLib;
 using System;
 using System.IO;
 using System.Linq;
@@ -17,7 +16,7 @@ public CertificateRequestWizard()
 
         private void CertificateRequestWizard_Load(object sender, EventArgs e)
         {
-            comboBox1.Items.AddRange(Program.CurrentWallet.GetContracts().Where(p => p.IsStandard).Select(p => Program.CurrentWallet.GetKey(p.PublicKeyHash).PublicKey).ToArray());
+            comboBox1.Items.AddRange(Program.CurrentWallet.GetAccounts().Where(p => !p.WatchOnly && p.Contract.IsStandard).Select(p => p.GetKey()).ToArray());
         }
 
         private void textBox_TextChanged(object sender, EventArgs e)
@@ -28,9 +27,8 @@ private void textBox_TextChanged(object sender, EventArgs e)
         private void button1_Click(object sender, EventArgs e)
         {
             if (saveFileDialog1.ShowDialog() != DialogResult.OK) return;
-            ECPoint point = (ECPoint)comboBox1.SelectedItem;
-            KeyPair key = Program.CurrentWallet.GetKey(point);
-            byte[] pubkey = point.EncodePoint(false).Skip(1).ToArray();
+            KeyPair key = (KeyPair)comboBox1.SelectedItem;
+            byte[] pubkey = key.PublicKey.EncodePoint(false).Skip(1).ToArray();
             byte[] prikey;
             using (key.Decrypt())
             {

diff --git a/neo-gui/UI/ContractDetailsDialog.cs b/neo-gui/UI/ContractDetailsDialog.cs
@@ -1,11 +1,12 @@
-using Neo.Wallets;
+using Neo.SmartContract;
+using Neo.Wallets;
 using System.Windows.Forms;
 
 namespace Neo.UI
 {
     internal partial class ContractDetailsDialog : Form
     {
-        public ContractDetailsDialog(VerificationContract contract)
+        public ContractDetailsDialog(Contract contract)
         {
             InitializeComponent();
             textBox1.Text = Wallet.ToAddress(contract.ScriptHash);

diff --git a/neo-gui/UI/CreateLockAccountDialog.cs b/neo-gui/UI/CreateLockAccountDialog.cs
@@ -1,6 +1,4 @@
-using Neo.Core;
-using Neo.Cryptography.ECC;
-using Neo.SmartContract;
+using Neo.SmartContract;
 using Neo.VM;
 using Neo.Wallets;
 using System;
@@ -14,23 +12,27 @@ internal partial class CreateLockAccountDialog : Form
         public CreateLockAccountDialog()
         {
             InitializeComponent();
-            comboBox1.Items.AddRange(Program.CurrentWallet.GetContracts().Where(p => p.IsStandard).Select(p => Program.CurrentWallet.GetKey(p.PublicKeyHash).PublicKey).ToArray());
+            comboBox1.Items.AddRange(Program.CurrentWallet.GetAccounts().Where(p => !p.WatchOnly && p.Contract.IsStandard).Select(p => p.GetKey()).ToArray());
         }
 
-        public VerificationContract GetContract()
+        public Contract GetContract()
         {
-            ECPoint publicKey = (ECPoint)comboBox1.SelectedItem;
             uint timestamp = dateTimePicker1.Value.ToTimestamp();
             using (ScriptBuilder sb = new ScriptBuilder())
             {
-                sb.EmitPush(publicKey);
+                sb.EmitPush(GetKey().PublicKey);
                 sb.EmitPush(timestamp);
                 // Lock 2.0 in mainnet tx:4e84015258880ced0387f34842b1d96f605b9cc78b308e1f0d876933c2c9134b
                 sb.EmitAppCall(UInt160.Parse("d3cce84d0800172d09c88ccad61130611bd047a4"));
-                return VerificationContract.Create(publicKey.EncodePoint(true).ToScriptHash(), new[] { ContractParameterType.Signature }, sb.ToArray());
+                return Contract.Create(new[] { ContractParameterType.Signature }, sb.ToArray());
             }
         }
 
+        public KeyPair GetKey()
+        {
+            return (KeyPair)comboBox1.SelectedItem;
+        }
+
         private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
         {
             button1.Enabled = comboBox1.SelectedIndex >= 0;

diff --git a/neo-gui/UI/CreateMultiSigContractDialog.cs b/neo-gui/UI/CreateMultiSigContractDialog.cs
@@ -1,31 +1,32 @@
-using Neo.Core;
-using Neo.Cryptography.ECC;
+using Neo.Cryptography.ECC;
+using Neo.SmartContract;
 using Neo.Wallets;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
 
 namespace Neo.UI
 {
     internal partial class CreateMultiSigContractDialog : Form
     {
+        private ECPoint[] publicKeys;
+
         public CreateMultiSigContractDialog()
         {
             InitializeComponent();
         }
 
-        public VerificationContract GetContract()
+        public Contract GetContract()
+        {
+            publicKeys = listBox1.Items.OfType<string>().Select(p => ECPoint.DecodePoint(p.HexToBytes(), ECCurve.Secp256r1)).ToArray();
+            return Contract.CreateMultiSigContract((int)numericUpDown2.Value, publicKeys);
+        }
+
+        public KeyPair GetKey()
         {
-            ECPoint[] publicKeys = listBox1.Items.OfType<string>().Select(p => ECPoint.DecodePoint(p.HexToBytes(), ECCurve.Secp256r1)).ToArray();
-            foreach (ECPoint publicKey in publicKeys)
-            {
-                KeyPair key = Program.CurrentWallet.GetKey(publicKey.EncodePoint(true).ToScriptHash());
-                if (key != null)
-                {
-                    return VerificationContract.CreateMultiSigContract(key.PublicKeyHash, (int)numericUpDown2.Value, publicKeys);
-                }
-            }
-            return null;
+            HashSet<ECPoint> hashSet = new HashSet<ECPoint>(publicKeys);
+            return Program.CurrentWallet.GetAccounts().FirstOrDefault(p => p.HasKey && hashSet.Contains(p.GetKey().PublicKey))?.GetKey();
         }
 
         private void numericUpDown2_ValueChanged(object sender, EventArgs e)

diff --git a/neo-gui/UI/CreateWalletDialog.designer.cs b/neo-gui/UI/CreateWalletDialog.designer.cs
diff --git a/neo-gui/UI/CreateWalletDialog.resx b/neo-gui/UI/CreateWalletDialog.resx
@@ -124,7 +124,7 @@
     <value>Wallet File:</value>
   </data>
   <data name="saveFileDialog1.Filter" xml:space="preserve">
-    <value>Wallet File|*.db3</value>
+    <value>Wallet File|*.json</value>
   </data>
   <data name="&gt;&gt;button1.Parent" xml:space="preserve">
     <value>$this</value>

diff --git a/neo-gui/UI/CreateWalletDialog.zh-Hans.resx b/neo-gui/UI/CreateWalletDialog.zh-Hans.resx
@@ -170,7 +170,7 @@
     <value>确定</value>
   </data>
   <data name="saveFileDialog1.Filter" xml:space="preserve">
-    <value>钱包数据库|*.db3</value>
+    <value>钱包文件|*.json</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
     <value>483, 105</value>

diff --git a/neo-gui/UI/ElectionDialog.cs b/neo-gui/UI/ElectionDialog.cs
@@ -38,7 +38,7 @@ public InvocationTransaction GetTransaction()
 
         private void ElectionDialog_Load(object sender, EventArgs e)
         {
-            comboBox1.Items.AddRange(Program.CurrentWallet.GetContracts().Where(p => p.IsStandard).Select(p => Program.CurrentWallet.GetKey(p.PublicKeyHash).PublicKey).ToArray());
+            comboBox1.Items.AddRange(Program.CurrentWallet.GetAccounts().Where(p => !p.WatchOnly && p.Contract.IsStandard).Select(p => p.GetKey().PublicKey).ToArray());
         }
 
         private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)

diff --git a/neo-gui/UI/Helper.cs b/neo-gui/UI/Helper.cs
@@ -49,7 +49,7 @@ public static void SignAndShowInformation(Transaction tx)
             if (context.Completed)
             {
                 context.Verifiable.Scripts = context.GetScripts();
-                Program.CurrentWallet.SaveTransaction(tx);
+                Program.CurrentWallet.ApplyTransaction(tx);
                 Program.LocalNode.Relay(tx);
                 InformationBox.Show(tx.Hash.ToString(), Strings.SendTxSucceedMessage, Strings.SendTxSucceedTitle);
             }

diff --git a/neo-gui/UI/ImportCustomContractDialog.Designer.cs b/neo-gui/UI/ImportCustomContractDialog.Designer.cs