Merge pull request #337 from mvs-org/0.8.5

v0.8.5-bug fixes and update cli commands
mvs-org · Dec 18, 2018 · 8dec1d8 · 8dec1d8
2 parents d2792f0 + 604cab9
commit 8dec1d8
Show file tree

Hide file tree

Showing 341 changed files with 18,106 additions and 3,715 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -58,6 +58,7 @@ SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fPIC")
 #ADD_DEFINITIONS(-DBOOST_NO_AUTO_PTR=1 -DBOOST_NO_RTTI=1 -DBOOST_NO_TYPEID=1)
 IF(CMAKE_BUILD_TYPE STREQUAL "DEBUG")
     ADD_DEFINITIONS(-DMVS_DEBUG=1)
+    ADD_DEFINITIONS(-DBOOST_CB_DISABLE_DEBUG=1)
 ENDIF()
 
 # --------------- Outputs ---------------------
@@ -131,6 +132,7 @@ INCLUDE_DIRECTORIES("${ZeroMQ_INCLUDE_DIRS}")
 IF(ENABLE_SHARED_LIBS)
     SET(mongoose_LIBRARY mongoose_shared)
     SET(jsoncpp_LIBRARY jsoncpp_shared)
+    SET(sodium_LIBRARY sodium_shared)
     SET(cryptojs_LIBRARY cryptojs_shared)
     SET(bitcoin_LIBRARY bitcoin_shared)
     SET(bitcoinmath_LIBRARY bitcoinmath_shared)
@@ -144,6 +146,7 @@ IF(ENABLE_SHARED_LIBS)
 ELSE()
     SET(mongoose_LIBRARY mongoose_static)
     SET(jsoncpp_LIBRARY jsoncpp_static)
+    SET(sodium_LIBRARY sodium_static)
     SET(cryptojs_LIBRARY cryptojs_static)
     SET(bitcoin_LIBRARY bitcoin_static)
     SET(bitcoinmath_LIBRARY bitcoinmath_static)

diff --git a/README.md b/README.md
@@ -119,6 +119,15 @@ $ ./configure --enable-module-recovery
 $ make -j4
 $ sudo make install && sudo ldconfig
 ```
+Sometimes we may meet the following compile error
+```
+undefined reference to '__gmpn_sub_n' ...
+```
+we may disable bignum in secp256k1 in this situation, use
+```
+$ ./configure --enable-module-recovery --with-bignum=no
+```
+and see more information here [#issue209](https://github.com/mvs-org/metaverse/issues/209)
 
 ## miniupnpc
 Modules blockchain/network with UPnP function required.

diff --git a/builds/mac/Metaverse.xcodeproj/project.pbxproj b/builds/mac/Metaverse.xcodeproj/project.pbxproj
@@ -7,30 +7,30 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		4C05ECA81F502042006CCA1D /* mvsd in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4C05ECA71F502042006CCA1D /* mvsd */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
+		49F4E035215B20F000B18D78 /* mvsd in Copy Files */ = {isa = PBXBuildFile; fileRef = 49F4E034215B20EF00B18D78 /* mvsd */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		4CD414641F4FF0F800A6CA41 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4CD414631F4FF0F800A6CA41 /* Assets.xcassets */; };
 		4CE027CD1F4FC6FE004FB704 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CE027CB1F4FC6FE004FB704 /* MainMenu.xib */; };
-		4CE027CF1F4FC70A004FB704 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4CE027CE1F4FC70A004FB704 /* Info.plist */; };
 		4CEF0CD41F553C3400328974 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CEF0CD31F553C3400328974 /* AppDelegate.swift */; };
 		4CEF0CD61F553C4700328974 /* GetBSDProcessList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CEF0CD51F553C4700328974 /* GetBSDProcessList.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
-		0A7A475B1E3D2C800093D1AB /* CopyFiles */ = {
+		0A7A475B1E3D2C800093D1AB /* Copy Files */ = {
 			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 8;
+			buildActionMask = 12;
 			dstPath = "";
 			dstSubfolderSpec = 6;
 			files = (
-				4C05ECA81F502042006CCA1D /* mvsd in CopyFiles */,
+				49F4E035215B20F000B18D78 /* mvsd in Copy Files */,
 			);
-			runOnlyForDeploymentPostprocessing = 1;
+			name = "Copy Files";
+			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
 		0ACF9ABE1E30FAB600D5C935 /* Metaverse.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Metaverse.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		4C05ECA71F502042006CCA1D /* mvsd */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = mvsd; path = ../build/bin/mvsd; sourceTree = "<group>"; };
+		49F4E034215B20EF00B18D78 /* mvsd */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = mvsd; path = "installer/mvs-pkg/bin/mvsd"; sourceTree = "<group>"; };
 		4CD414631F4FF0F800A6CA41 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Metaverse/Assets.xcassets; sourceTree = SOURCE_ROOT; };
 		4CE027CC1F4FC6FE004FB704 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = MainMenu.xib; sourceTree = "<group>"; };
 		4CE027CE1F4FC70A004FB704 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Metaverse/Info.plist; sourceTree = SOURCE_ROOT; };
@@ -52,7 +52,7 @@
 		0ACF9AB51E30FAB600D5C935 = {
 			isa = PBXGroup;
 			children = (
-				4C05ECA71F502042006CCA1D /* mvsd */,
+				49F4E034215B20EF00B18D78 /* mvsd */,
 				0ACF9AC01E30FAB600D5C935 /* Metaverse */,
 				0ACF9ABF1E30FAB600D5C935 /* Products */,
 			);
@@ -97,7 +97,7 @@
 				0ACF9ABA1E30FAB600D5C935 /* Sources */,
 				0ACF9ABB1E30FAB600D5C935 /* Frameworks */,
 				0ACF9ABC1E30FAB600D5C935 /* Resources */,
-				0A7A475B1E3D2C800093D1AB /* CopyFiles */,
+				0A7A475B1E3D2C800093D1AB /* Copy Files */,
 			);
 			buildRules = (
 			);
@@ -115,13 +115,13 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0800;
-				LastUpgradeCheck = 0830;
+				LastUpgradeCheck = 0940;
 				ORGANIZATIONNAME = "Metaverse Fundation";
 				TargetAttributes = {
 					0ACF9ABD1E30FAB600D5C935 = {
 						CreatedOnToolsVersion = 8.0;
-						DevelopmentTeam = 6EDHACMBKZ;
-						LastSwiftMigration = 0830;
+						DevelopmentTeam = Z9LLD4BACL;
+						LastSwiftMigration = 0940;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -149,7 +149,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4CE027CF1F4FC70A004FB704 /* Info.plist in Resources */,
 				4CE027CD1F4FC6FE004FB704 /* MainMenu.xib in Resources */,
 				4CD414641F4FF0F800A6CA41 /* Assets.xcassets in Resources */,
 			);
@@ -190,22 +189,31 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "-";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEVELOPMENT_TEAM = 9D4XG38K67;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -241,22 +249,31 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "-";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = 9D4XG38K67;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -269,6 +286,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				MTL_ENABLE_DEBUG_INFO = NO;
+				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_NAME = Metaverse;
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -280,9 +298,10 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "Mac Developer";
+				CODE_SIGN_IDENTITY = "";
+				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = 6EDHACMBKZ;
+				DEVELOPMENT_TEAM = Z9LLD4BACL;
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
 				INFOPLIST_FILE = "$(SRCROOT)/Metaverse/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
@@ -299,9 +318,10 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "Mac Developer";
+				CODE_SIGN_IDENTITY = "";
+				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = 6EDHACMBKZ;
+				DEVELOPMENT_TEAM = Z9LLD4BACL;
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
 				INFOPLIST_FILE = "$(SRCROOT)/Metaverse/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
@@ -322,7 +342,7 @@
 				0ACF9ACA1E30FAB600D5C935 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Debug;
+			defaultConfigurationName = Release;
 		};
 		0ACF9ACB1E30FAB600D5C935 /* Build configuration list for PBXNativeTarget "Metaverse" */ = {
 			isa = XCConfigurationList;
@@ -331,7 +351,7 @@
 				0ACF9ACD1E30FAB600D5C935 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Debug;
+			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};

diff --git a/builds/mac/Metaverse/AppDelegate.swift b/builds/mac/Metaverse/AppDelegate.swift
@@ -155,8 +155,9 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 		let processes = GetBSDProcessList()!
 		let metaverseProcess = processes.index(where: {
 			var name = $0.kp_proc.p_comm
+			let length = MemoryLayout.size(ofValue: name)
 			let str = withUnsafePointer(to: &name) {
-				$0.withMemoryRebound(to: UInt8.self, capacity: MemoryLayout.size(ofValue: name)) {
+				$0.withMemoryRebound(to: UInt8.self, capacity: length) {
 				String(cString: $0)
 				}
 			}

diff --git a/builds/mac/Metaverse/Info.plist b/builds/mac/Metaverse/Info.plist
@@ -27,7 +27,7 @@
 	<key>LSUIElement</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2017 Metaverse Foundation. All rights reserved.</string>
+	<string>Copyright © 2018 Metaverse Foundation. All rights reserved.</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>

diff --git a/builds/mac/installer/post-install-withdb.sh b/builds/mac/installer/post-install-withdb.sh
@@ -1,9 +1,9 @@
 #!/bin/bash - 
 #===============================================================================
 #
-#          FILE: pre-install.sh
+#          FILE: post-install-withdb.sh
 # 
-#         USAGE: ./post-install.sh 
+#         USAGE: ./post-install-withdb.sh
 # 
 #   DESCRIPTION: 
 # 

diff --git a/builds/mac/installer/post-install.sh b/builds/mac/installer/post-install.sh
@@ -1,7 +1,7 @@
 #!/bin/bash - 
 #===============================================================================
 #
-#          FILE: pre-install.sh
+#          FILE: post-install.sh
 # 
 #         USAGE: ./post-install.sh 
 # 

diff --git a/builds/msvc-140/bitcoin/bitcoin.vcxproj b/builds/msvc-140/bitcoin/bitcoin.vcxproj
@@ -165,6 +165,7 @@
     <ClCompile Include="..\..\..\src\lib\bitcoin\wallet\select_outputs.cpp" />
     <ClCompile Include="..\..\..\src\lib\bitcoin\wallet\stealth_address.cpp" />
     <ClCompile Include="..\..\..\src\lib\bitcoin\wallet\uri.cpp" />
+    <ClCompile Include="..\..\..\src\lib\bitcoin\wallet\vrf_private.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\include\metaverse\bitcoin\base_primary.hpp" />
@@ -231,6 +232,7 @@
     <ClInclude Include="..\..\..\include\metaverse\bitcoin\math\script_number.hpp" />
     <ClInclude Include="..\..\..\include\metaverse\bitcoin\math\stealth.hpp" />
     <ClInclude Include="..\..\..\include\metaverse\bitcoin\math\uint256.hpp" />
+    <ClInclude Include="..\..\..\include\metaverse\bitcoin\math\ecvrf.hpp" />
     <ClInclude Include="..\..\..\include\metaverse\bitcoin\messages.hpp" />
     <ClInclude Include="..\..\..\include\metaverse\bitcoin\message\address.hpp" />
     <ClInclude Include="..\..\..\include\metaverse\bitcoin\message\block_message.hpp" />
@@ -337,6 +339,7 @@
     <ClInclude Include="..\..\..\include\metaverse\bitcoin\wallet\stealth_address.hpp" />
     <ClInclude Include="..\..\..\include\metaverse\bitcoin\wallet\uri.hpp" />
     <ClInclude Include="..\..\..\include\metaverse\bitcoin\wallet\uri_reader.hpp" />
+    <ClInclude Include="..\..\..\include\metaverse\bitcoin\wallet\vrf_private.hpp" />
     <ClInclude Include="..\..\..\src\lib\bitcoin\chain\script\conditional_stack.hpp" />
     <ClInclude Include="..\..\..\src\lib\bitcoin\chain\script\evaluation_context.hpp" />
     <ClInclude Include="..\..\..\src\lib\bitcoin\math\external\aes256.h" />
@@ -379,6 +382,11 @@
     <None Include="..\..\..\src\lib\bitcoin\wallet\parse_encrypted_keys\parse_encrypted_key.ipp" />
     <None Include="..\..\..\src\lib\bitcoin\wallet\parse_encrypted_keys\parse_encrypted_prefix.ipp" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\sodium\sodium.vcxproj">
+      <Project>{b383014a-74fb-4241-a98a-be33b92e9ea3}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{54C72203-A5A0-4714-8D0C-D51AA4AABAC8}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
@@ -428,7 +436,7 @@
       <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <ObjectFileName>$(IntDir)a\a%(RelativeDir)</ObjectFileName>
-      <AdditionalIncludeDirectories>..\..\..\include;..\..\..\..\boost_1_63_0;..\..\..\..\secp256k1\include;..\..\..\src\lib\consensus\clone;..\..\..\contrib;..\..\..\..\zeromq-4.2.1\include;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\include;..\..\..\..\boost_1_63_0;..\..\..\..\secp256k1\include;..\..\..\src\lib\consensus\clone;..\..\..\contrib;..\..\..\contrib\sodium;..\..\..\..\zeromq-4.2.1\include;</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -445,7 +453,7 @@
       <SDLCheck>true</SDLCheck>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <ObjectFileName>$(IntDir)a\a%(RelativeDir)</ObjectFileName>
-      <AdditionalIncludeDirectories>..\..\..\include;..\..\..\..\boost_1_63_0;..\..\..\..\secp256k1\include;..\..\..\src\lib\consensus\clone;..\..\..\contrib;..\..\..\..\zeromq-4.2.1\include;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\include;..\..\..\..\boost_1_63_0;..\..\..\..\secp256k1\include;..\..\..\src\lib\consensus\clone;..\..\..\..\zeromq-4.2.1\include;..\..\..\contrib;..\..\..\contrib\sodium</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/builds/msvc-140/bitcoin/bitcoin.vcxproj.filters b/builds/msvc-140/bitcoin/bitcoin.vcxproj.filters
@@ -581,6 +581,9 @@
     <ClCompile Include="..\..\..\src\lib\bitcoin\chain\output_point.cpp">
       <Filter>Source Files\chain</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\lib\bitcoin\wallet\vrf_private.cpp">
+      <Filter>Source Files\wallet</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\src\lib\bitcoin\math\secp256k1_initializer.hpp">
@@ -1153,6 +1156,12 @@
     <ClInclude Include="..\..\..\include\metaverse\bitcoin\base_primary.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\include\metaverse\bitcoin\math\ecvrf.hpp">
+      <Filter>Header Files\math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\metaverse\bitcoin\wallet\vrf_private.hpp">
+      <Filter>Header Files\wallet</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\src\lib\bitcoin\wallet\parse_encrypted_keys\parse_encrypted_key.ipp">

diff --git a/builds/msvc-140/consensus/consensus.vcxproj b/builds/msvc-140/consensus/consensus.vcxproj
@@ -14,6 +14,7 @@
     <ClInclude Include="..\..\..\include\metaverse\consensus\consensus.hpp" />
     <ClInclude Include="..\..\..\include\metaverse\consensus\define.hpp" />
     <ClInclude Include="..\..\..\include\metaverse\consensus\export.hpp" />
+    <ClInclude Include="..\..\..\include\metaverse\consensus\fts.hpp" />
     <ClInclude Include="..\..\..\include\metaverse\consensus\libdevcore\Base64.h" />
     <ClInclude Include="..\..\..\include\metaverse\consensus\libdevcore\BasicType.h" />
     <ClInclude Include="..\..\..\include\metaverse\consensus\libdevcore\boost_multiprecision_number_compare_bug_workaround.hpp" />
@@ -33,6 +34,7 @@
     <ClInclude Include="..\..\..\include\metaverse\consensus\miner.hpp" />
     <ClInclude Include="..\..\..\include\metaverse\consensus\miner\MinerAux.h" />
     <ClInclude Include="..\..\..\include\metaverse\consensus\version.hpp" />
+    <ClInclude Include="..\..\..\include\metaverse\consensus\witness.hpp" />
     <ClInclude Include="..\..\..\src\lib\consensus\clone\amount.h" />
     <ClInclude Include="..\..\..\src\lib\consensus\clone\compat\byteswap.h" />
     <ClInclude Include="..\..\..\src\lib\consensus\clone\compat\endian.h" />
@@ -80,7 +82,9 @@
     <ClCompile Include="..\..\..\src\lib\consensus\common\libdevcore\SHA3.cpp" />
     <ClCompile Include="..\..\..\src\lib\consensus\common\miner\MinerAux.cpp" />
     <ClCompile Include="..\..\..\src\lib\consensus\consensus\consensus.cpp" />
+    <ClCompile Include="..\..\..\src\lib\consensus\fts.cpp" />
     <ClCompile Include="..\..\..\src\lib\consensus\miner.cpp" />
+    <ClCompile Include="..\..\..\src\lib\consensus\witness.cpp" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{D21052F1-33B6-4F1F-BB8D-5C0E8173E416}</ProjectGuid>