Change ReleaseVersion to ProtocolVersion && add publish version

AElfProject · Dec 6, 2018 · 328345a · 328345a
1 parent f6917a9
commit 328345a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/AElf.Common/GlobalConfig.cs b/AElf.Common/GlobalConfig.cs
@@ -1,11 +1,13 @@
+using System.Reflection;
+
 namespace AElf.Common
 {
     // ReSharper disable InconsistentNaming
     public static class GlobalConfig
     {
         // current release version
-        public static string ReleaseVersion = "0.6"; 
-        
+        public static int ProtocolVersion = 1;
+
         public static int AddressLength = 18;
         public const ulong GenesisBlockHeight = 1;
         public static readonly string GenesisSmartContractZeroAssemblyName = "AElf.Contracts.Genesis";

diff --git a/AElf.Network.Tests/NetworkTestHelpers.cs b/AElf.Network.Tests/NetworkTestHelpers.cs
@@ -21,7 +21,7 @@ public static (ECKeyPair, Handshake) CreateKeyPairAndHandshake(int port)
             {
                 NodeInfo = nodeInfo,
                 PublicKey = ByteString.CopyFrom(key.GetEncodedPublicKey()),
-                Version = GlobalConfig.ReleaseVersion,
+                Version = GlobalConfig.ProtocolVersion,
                 R = ByteString.CopyFrom(sig.R),
                 S = ByteString.CopyFrom(sig.S),
             };

diff --git a/AElf.Network/Data/Protobuf/Definitions/messages.proto b/AElf.Network/Data/Protobuf/Definitions/messages.proto
@@ -9,7 +9,7 @@ message Handshake {
     NodeData NodeInfo = 1;
     bytes PublicKey = 2;
     int32 Height = 3;
-    string Version = 4;
+    int32 Version = 4;
     // sig NodeData
     bytes R = 9;
     bytes S = 10;

diff --git a/AElf.Network/Peers/Peer.cs b/AElf.Network/Peers/Peer.cs
@@ -277,9 +277,9 @@ private void StartAuthentification()
                 NodeInfo = nodeInfo,
                 PublicKey = ByteString.CopyFrom(_nodeKey.GetEncodedPublicKey()),
                 Height = CurrentHeight,
-                Version = GlobalConfig.ReleaseVersion,
+                Version = GlobalConfig.ProtocolVersion,
                 R = ByteString.CopyFrom(sig.R),
-                S = ByteString.CopyFrom(sig.S),
+                S = ByteString.CopyFrom(sig.S)
             };
 
             byte[] packet = nd.ToByteArray();
@@ -361,7 +361,7 @@ internal void AuthentifyWith(Handshake handshakeMsg)
 
             try
             {
-                if (string.IsNullOrEmpty(handshakeMsg.Version) || handshakeMsg.Version != GlobalConfig.ReleaseVersion)
+                if (handshakeMsg.Version != GlobalConfig.ProtocolVersion)
                 {
                     FireInvalidAuth(RejectReason.AuthWrongVersion);
                     return;

diff --git a/deploy.sh b/deploy.sh
@@ -6,7 +6,7 @@ DOCKER_USERNAME=$2
 DOCKER_PASSWORD=$3
 
 # AElf node
-dotnet publish -c Release -o ~/aelf/
+dotnet publish /p:Version=$TAG -c Release -o ~/aelf/
 
 docker build -t aelf/node:$TAG ~/aelf/.
 docker tag aelf/node:$TAG aelf/node:latest