From f14c16ef21ac2d668f8a5bebe8702d80c4ea3edb Mon Sep 17 00:00:00 2001
From: jowenshaw <xiaozongyuan@163.com>
Date: Thu, 4 Jan 2018 17:15:20 +0800
Subject: [PATCH 1/4] modify README.md, add Run MVS entity.

---
 README.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/README.md b/README.md
index ce5c785a9..8a30f197f 100644
--- a/README.md
+++ b/README.md
@@ -113,4 +113,21 @@ $ make -j4
 $ sudo make install && sudo ldconfig
 ```
 
+# Run MVS
+After MVS is built successfully, there are two executable files in the _bin_ directory:
+
+ - **mvsd** - server program  
+   Runs a full metaverse node in the global peer-to-peer network.
+
+ - **mvs-cli** - client program  
+   Sent your request to the server, the server will process it and return response to your client.
+
+Go to _bin_ diretory, and run the program.
+More information please reference to [Command line usage](https://docs.mvs.org/docs/command-line.html) and [Configuration file](https://docs.mvs.org/docs/config-file.html).
+```bash
+$ cd bin
+$ ./mvsd
+$ ./mvs-cli $command $params $options
+```
+
 # [Run in docker](https://github.com/mvs-org/metaverse/tree/develop/builds/docker)

From 725013db86238ca99e3a8bf8cd8a39609044eacc Mon Sep 17 00:00:00 2001
From: jowenshaw <xiaozongyuan@163.com>
Date: Mon, 8 Jan 2018 14:18:02 +0800
Subject: [PATCH 2/4] fix to run "make doc" without failure

---
 README.md | 4 ++--
 doc/CNAME | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 doc/CNAME

diff --git a/README.md b/README.md
index 8a30f197f..8dc3d34e7 100644
--- a/README.md
+++ b/README.md
@@ -68,8 +68,8 @@ $ make install
 
 optional:
 ```bash
-$ make test
-$ make doc
+$ make test (should install boost_unit_test_framework)
+$ make doc  (should install doxygen and graphviz)
 ```
 *Needs to configure Library Dependencies firstly.*
 
diff --git a/doc/CNAME b/doc/CNAME
new file mode 100644
index 000000000..fe4eebc8f
--- /dev/null
+++ b/doc/CNAME
@@ -0,0 +1 @@
+docs.mvs.org

From e038fff92952df3465020630eca15904e80ae875 Mon Sep 17 00:00:00 2001
From: jowenshaw <xiaozongyuan@163.com>
Date: Wed, 10 Jan 2018 15:58:33 +0800
Subject: [PATCH 3/4] fix issue #226: verifyaddress returns a poorly
 JSON-formatted response

---
 .../explorer/extensions/commands/validateaddress.hpp   |  4 ++--
 .../explorer/extensions/commands/validateaddress.cpp   | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/include/metaverse/explorer/extensions/commands/validateaddress.hpp b/include/metaverse/explorer/extensions/commands/validateaddress.hpp
index 42971a602..2f6048ea7 100644
--- a/include/metaverse/explorer/extensions/commands/validateaddress.hpp
+++ b/include/metaverse/explorer/extensions/commands/validateaddress.hpp
@@ -63,7 +63,7 @@ class validateaddress: public command_extension
         )
         (
             "PAYMENT_ADDRESS",
-            value<bc::wallet::payment_address>(&argument_.address),
+            value<std::string>(&argument_.address),
             "Valid payment address. If not specified the address is read from STDIN."
         );
 
@@ -79,7 +79,7 @@ class validateaddress: public command_extension
 
     struct argument
     {
-        bc::wallet::payment_address address;
+        std::string address;
     } argument_;
 
     struct option
diff --git a/src/lib/explorer/extensions/commands/validateaddress.cpp b/src/lib/explorer/extensions/commands/validateaddress.cpp
index eb74750bb..e0d312d9f 100644
--- a/src/lib/explorer/extensions/commands/validateaddress.cpp
+++ b/src/lib/explorer/extensions/commands/validateaddress.cpp
@@ -34,18 +34,20 @@ console_result validateaddress::invoke (Json::Value& jv_output,
          libbitcoin::server::server_node& node)
 {
     std::string version_info;
-	std::string message{"valid address "};
+    std::string message{"valid address"};
     bool is_valid{true};
 
     auto& blockchain = node.chain_impl();
+    wallet::payment_address payment_address(argument_.address);
 
-    if (!blockchain.chain_settings().use_testnet_rules && argument_.address.version() == 0x32) {
+    if (!blockchain.chain_settings().use_testnet_rules && payment_address.version() == 0x32) {
         version_info = "p2kh(main-net)";
-    } else if (blockchain.chain_settings().use_testnet_rules && argument_.address.version() ==  0x7f ) {
+    } else if (blockchain.chain_settings().use_testnet_rules && payment_address.version() ==  0x7f ) {
         version_info = "p2kh(test-net)";
-    } else if (argument_.address.version() ==  0x05 ) {
+    } else if (payment_address.version() ==  0x05 ) {
         version_info = "p2sh(multi-signature)";
     } else {
+        version_info = "none";
         message = "invalid address!";
         is_valid = false;
     }

From 21906ab72064070a69c684054114e6dae88e5573 Mon Sep 17 00:00:00 2001
From: Jowen <jowen.xiao@viewfin.com>
Date: Fri, 12 Jan 2018 11:01:40 +0800
Subject: [PATCH 4/4] get rid of duplicate LOG_DATABASE macro definition

---
 include/metaverse/database/data_base.hpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/metaverse/database/data_base.hpp b/include/metaverse/database/data_base.hpp
index 85c77a749..694173b71 100644
--- a/include/metaverse/database/data_base.hpp
+++ b/include/metaverse/database/data_base.hpp
@@ -50,8 +50,6 @@
 #include <metaverse/database/databases/blockchain_asset_database.hpp>
 #include <metaverse/database/databases/address_asset_database.hpp>
 #include <metaverse/database/databases/account_asset_database.hpp>
-//#include <metaverse/bitcoin/wallet/payment_address.hpp>
-#define  LOG_DATABASE  "database"  // for log_debug output
 
 using namespace libbitcoin::wallet;                                         
 using namespace libbitcoin::chain;