rename fields; upgrade to AntShares.VM 1.2.1;

tanZiWen · Dec 19, 2016 · b7cc047 · b7cc047
1 parent c1b16ec
commit b7cc047
Show file tree

Hide file tree

Showing 16 changed files with 187 additions and 248 deletions.
diff --git a/src/AntShares/Consensus/ConsensusContext.cs b/src/AntShares/Consensus/ConsensusContext.cs
@@ -64,7 +64,7 @@ public Block MakeHeader()
                     MerkleRoot = MerkleTree.ComputeRoot(TransactionHashes),
                     Timestamp = Timestamp,
                     Height = Height,
-                    Nonce = Nonce,
+                    ConsensusData = Nonce,
                     NextMiner = NextMiner,
                     Transactions = new Transaction[0]
                 };

diff --git a/src/AntShares/Core/Block.cs b/src/AntShares/Core/Block.cs
@@ -35,7 +35,7 @@ public Header Header
                         MerkleRoot = MerkleRoot,
                         Timestamp = Timestamp,
                         Height = Height,
-                        Nonce = Nonce,
+                        ConsensusData = ConsensusData,
                         NextMiner = NextMiner,
                         Script = Script
                     };

diff --git a/src/AntShares/Core/BlockBase.cs b/src/AntShares/Core/BlockBase.cs
@@ -30,10 +30,7 @@ public abstract class BlockBase : IApiInterface, ISignable
         /// 区块高度
         /// </summary>
         public uint Height;
-        /// <summary>
-        /// 随机数
-        /// </summary>
-        public ulong Nonce;
+        public ulong ConsensusData;
         /// <summary>
         /// 下一个区块的记账合约的散列值
         /// </summary>
@@ -85,11 +82,11 @@ void ISignable.DeserializeUnsigned(BinaryReader reader)
             MerkleRoot = reader.ReadSerializable<UInt256>();
             Timestamp = reader.ReadUInt32();
             Height = reader.ReadUInt32();
-            Nonce = reader.ReadUInt64();
+            ConsensusData = reader.ReadUInt64();
             NextMiner = reader.ReadSerializable<UInt160>();
         }
 
-        byte[] ISignableObject.GetMessage()
+        byte[] IScriptContainer.GetMessage()
         {
             return this.GetHashData();
         }
@@ -116,10 +113,15 @@ void ISignable.SerializeUnsigned(BinaryWriter writer)
             writer.Write(MerkleRoot);
             writer.Write(Timestamp);
             writer.Write(Height);
-            writer.Write(Nonce);
+            writer.Write(ConsensusData);
             writer.Write(NextMiner);
         }
 
+        byte[] IApiInterface.ToArray()
+        {
+            return this.ToArray();
+        }
+
         public virtual JObject ToJson()
         {
             JObject json = new JObject();
@@ -130,7 +132,7 @@ public virtual JObject ToJson()
             json["merkleroot"] = MerkleRoot.ToString();
             json["time"] = Timestamp;
             json["height"] = Height;
-            json["nonce"] = Nonce.ToString("x16");
+            json["nonce"] = ConsensusData.ToString("x16");
             json["nextminer"] = Wallet.ToAddress(NextMiner);
             json["script"] = Script.ToJson();
             return json;

diff --git a/src/AntShares/Core/Blockchain.cs b/src/AntShares/Core/Blockchain.cs
@@ -89,7 +89,7 @@ public abstract class Blockchain : IDisposable, IScriptTable
             PrevBlock = UInt256.Zero,
             Timestamp = (new DateTime(2016, 7, 15, 15, 8, 21, DateTimeKind.Utc)).ToTimestamp(),
             Height = 0,
-            Nonce = 2083236893, //向比特币致敬
+            ConsensusData = 2083236893, //向比特币致敬
             NextMiner = GetMinerAddress(StandbyMiners),
             Script = new Witness
             {

diff --git a/src/AntShares/Core/CoinReference.cs b/src/AntShares/Core/CoinReference.cs
@@ -68,6 +68,11 @@ void ISerializable.Serialize(BinaryWriter writer)
             writer.Write(PrevIndex);
         }
 
+        byte[] IApiInterface.ToArray()
+        {
+            return this.ToArray();
+        }
+
         /// <summary>
         /// 将交易输入转变为json对象
         /// </summary>

diff --git a/src/AntShares/Core/Header.cs b/src/AntShares/Core/Header.cs
@@ -5,7 +5,7 @@
 
 namespace AntShares.Core
 {
-    public class Header : BlockBase, IApiInterface, IEquatable<Header>
+    public class Header : BlockBase, IEquatable<Header>
     {
         public override int Size => base.Size + 1;
 

diff --git a/src/AntShares/Core/ISignable.cs b/src/AntShares/Core/ISignable.cs
@@ -7,7 +7,7 @@ namespace AntShares.Core
     /// <summary>
     /// 为需要签名的数据提供一个接口
     /// </summary>
-    public interface ISignable : ISerializable, ISignableObject
+    public interface ISignable : ISerializable, IScriptContainer
     {
         /// <summary>
         /// 用于验证该对象的脚本列表

diff --git a/src/AntShares/Core/Order.cs b/src/AntShares/Core/Order.cs
@@ -87,7 +87,7 @@ private void DeserializeUnsignedInternal(BinaryReader reader, UInt256 asset_id,
                 throw new FormatException();
         }
 
-        byte[] ISignableObject.GetMessage()
+        byte[] IScriptContainer.GetMessage()
         {
             return this.GetHashData();
         }

diff --git a/src/AntShares/Core/Transaction.cs b/src/AntShares/Core/Transaction.cs
@@ -202,7 +202,7 @@ public override int GetHashCode()
             return Hash.GetHashCode();
         }
 
-        byte[] ISignableObject.GetMessage()
+        byte[] IScriptContainer.GetMessage()
         {
             return this.GetHashData();
         }
@@ -285,6 +285,11 @@ void ISignable.SerializeUnsigned(BinaryWriter writer)
             writer.Write(Outputs);
         }
 
+        byte[] IApiInterface.ToArray()
+        {
+            return this.ToArray();
+        }
+
         /// <summary>
         /// 变成json对象
         /// </summary>

diff --git a/src/AntShares/Core/TransactionAttribute.cs b/src/AntShares/Core/TransactionAttribute.cs
@@ -66,6 +66,11 @@ void ISerializable.Serialize(BinaryWriter writer)
                 writer.Write(Data);
         }
 
+        byte[] IApiInterface.ToArray()
+        {
+            return this.ToArray();
+        }
+
         /// <summary>
         /// 变成json对象
         /// </summary>

diff --git a/src/AntShares/Core/TransactionOutput.cs b/src/AntShares/Core/TransactionOutput.cs
@@ -42,6 +42,11 @@ void ISerializable.Serialize(BinaryWriter writer)
             writer.Write(ScriptHash);
         }
 
+        byte[] IApiInterface.ToArray()
+        {
+            return this.ToArray();
+        }
+
         /// <summary>
         /// 将交易输出转变为json对象
         /// </summary>

diff --git a/src/AntShares/Network/Payloads/ConsensusPayload.cs b/src/AntShares/Network/Payloads/ConsensusPayload.cs
@@ -66,7 +66,7 @@ void ISignable.DeserializeUnsigned(BinaryReader reader)
             Data = reader.ReadVarBytes();
         }
 
-        byte[] ISignableObject.GetMessage()
+        byte[] IScriptContainer.GetMessage()
         {
             return this.GetHashData();
         }

diff --git a/src/AntShares/Network/Payloads/MerkleBlockPayload.cs b/src/AntShares/Network/Payloads/MerkleBlockPayload.cs
@@ -35,7 +35,7 @@ public static MerkleBlockPayload Create(Block block, BitArray flags)
                 MerkleRoot = block.MerkleRoot,
                 Timestamp = block.Timestamp,
                 Height = block.Height,
-                Nonce = block.Nonce,
+                ConsensusData = block.ConsensusData,
                 NextMiner = block.NextMiner,
                 Script = block.Script,
                 TxCount = block.Transactions.Length,

diff --git a/src/AntShares/Network/RemoteNode.cs b/src/AntShares/Network/RemoteNode.cs
@@ -333,18 +333,18 @@ private void OnMessageReceived(Message message)
                     if (message.Payload.Length <= 1024 * 1024)
                         OnInventoryReceived(Transaction.DeserializeFrom(message.Payload));
                     break;
+                case "verack":
+                case "version":
+                    Disconnect(true);
+                    break;
                 case "alert":
                 case "merkleblock":
                 case "notfound":
                 case "ping":
                 case "pong":
                 case "reject":
-                    //暂时忽略
-                    break;
-                case "verack":
-                case "version":
                 default:
-                    Disconnect(true);
+                    //暂时忽略
                     break;
             }
         }