Merge pull request #327 from mvs-org/0.8.3

release v0.8.3
mvs-org · Aug 30, 2018 · 4eb8ef6 · 4eb8ef6
2 parents e440195 + f1869ed
commit 4eb8ef6
Show file tree

Hide file tree

Showing 86 changed files with 2,748 additions and 2,216 deletions.
diff --git a/.gitignore b/.gitignore
@@ -54,6 +54,8 @@ ipch/
 *.cachefile
 *.VC.db
 *.VC.VC.opendb
+.vscode
+.vscode/*
 
 # Cscope files
 cscope.*

diff --git a/builds/msvc-140/explorer/explorer.vcxproj b/builds/msvc-140/explorer/explorer.vcxproj
@@ -63,15 +63,16 @@
     <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\deletemultisig.hpp" />
     <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\deposit.hpp" />
     <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\didchangeaddress.hpp" />
-    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\didsend.hpp" />
-    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\didsendasset.hpp" />
-    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\didsendassetfrom.hpp" />
-    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\didsendfrom.hpp" />
-    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\didsendmore.hpp" />
+    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\send.hpp" />
+    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\sendasset.hpp" />
+    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\sendassetfrom.hpp" />
+    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\sendfrom.hpp" />
+    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\sendmore.hpp" />
     <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\dumpkeyfile.hpp" />
     <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\fetchheaderext.hpp" />
     <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\getaccount.hpp" />
     <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\getaccountasset.hpp" />
+    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\getassetview.hpp" />
     <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\getaddressasset.hpp" />
     <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\getaddressetp.hpp" />
     <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\getasset.hpp" />
@@ -105,15 +106,9 @@
     <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\listtxs.hpp" />
     <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\registermit.hpp" />
     <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\secondaryissue.hpp" />
-    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\send.hpp" />
-    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\sendasset.hpp" />
+    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\swaptoken.hpp" />
     <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\transfercert.hpp" />
-    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\sendassetfrom.hpp" />
-    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\sendfrom.hpp" />
-    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\sendmore.hpp" />
     <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\sendrawtx.hpp" />
-    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\sendwithmsg.hpp" />
-    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\sendwithmsgfrom.hpp" />
     <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\setminingaccount.hpp" />
     <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\shutdown.hpp" />
     <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\signmultisigtx.hpp" />
@@ -189,15 +184,16 @@
     <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\deletemultisig.cpp" />
     <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\deposit.cpp" />
     <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\didchangeaddress.cpp" />
-    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\didsend.cpp" />
-    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\didsendasset.cpp" />
-    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\didsendassetfrom.cpp" />
-    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\didsendfrom.cpp" />
-    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\didsendmore.cpp" />
+    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\send.cpp" />
+    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\sendasset.cpp" />
+    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\sendassetfrom.cpp" />
+    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\sendfrom.cpp" />
+    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\sendmore.cpp" />
     <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\dumpkeyfile.cpp" />
     <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\fetchheaderext.cpp" />
     <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\getaccount.cpp" />
     <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\getaccountasset.cpp" />
+    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\getassetview.cpp" />
     <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\getaddressasset.cpp" />
     <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\getaddressetp.cpp" />
     <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\getasset.cpp" />
@@ -231,15 +227,9 @@
     <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\listtxs.cpp" />
     <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\registermit.cpp" />
     <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\secondaryissue.cpp" />
-    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\send.cpp" />
-    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\sendasset.cpp" />
+    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\swaptoken.cpp" />
     <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\transfercert.cpp" />
-    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\sendassetfrom.cpp" />
-    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\sendfrom.cpp" />
-    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\sendmore.cpp" />
     <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\sendrawtx.cpp" />
-    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\sendwithmsg.cpp" />
-    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\sendwithmsgfrom.cpp" />
     <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\setminingaccount.cpp" />
     <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\shutdown.cpp" />
     <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\signmultisigtx.cpp" />
@@ -258,6 +248,9 @@
     <ClCompile Include="..\..\..\src\lib\explorer\parser.cpp" />
     <ClCompile Include="..\..\..\src\lib\explorer\utility.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <Text Include="..\..\..\include\CMakeLists.txt" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{9DE1D113-1D5B-401A-A5D4-8364598ABEE6}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>

diff --git a/builds/msvc-140/explorer/explorer.vcxproj.filters b/builds/msvc-140/explorer/explorer.vcxproj.filters
@@ -188,7 +188,7 @@
     <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\deposit.hpp">
       <Filter>Header Files\extensions\commands</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\didsendmore.hpp">
+    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\sendmore.hpp">
       <Filter>Header Files\extensions\commands</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\dumpkeyfile.hpp">
@@ -200,6 +200,9 @@
     <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\getaccountasset.hpp">
       <Filter>Header Files\extensions\commands</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\getassetview.hpp">
+      <Filter>Header Files\extensions\commands</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\getaddressasset.hpp">
       <Filter>Header Files\extensions\commands</Filter>
     </ClInclude>
@@ -272,30 +275,9 @@
     <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\listtxs.hpp">
       <Filter>Header Files\extensions\commands</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\send.hpp">
-      <Filter>Header Files\extensions\commands</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\sendasset.hpp">
-      <Filter>Header Files\extensions\commands</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\sendassetfrom.hpp">
-      <Filter>Header Files\extensions\commands</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\sendfrom.hpp">
-      <Filter>Header Files\extensions\commands</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\sendmore.hpp">
-      <Filter>Header Files\extensions\commands</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\sendrawtx.hpp">
       <Filter>Header Files\extensions\commands</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\sendwithmsg.hpp">
-      <Filter>Header Files\extensions\commands</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\sendwithmsgfrom.hpp">
-      <Filter>Header Files\extensions\commands</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\setminingaccount.hpp">
       <Filter>Header Files\extensions\commands</Filter>
     </ClInclude>
@@ -383,16 +365,16 @@
     <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\registerdid.hpp">
       <Filter>Header Files\extensions\commands</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\didsendfrom.hpp">
+    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\sendfrom.hpp">
       <Filter>Header Files\extensions\commands</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\didsendassetfrom.hpp">
+    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\sendassetfrom.hpp">
       <Filter>Header Files\extensions\commands</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\didsendasset.hpp">
+    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\sendasset.hpp">
       <Filter>Header Files\extensions\commands</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\didsend.hpp">
+    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\send.hpp">
       <Filter>Header Files\extensions\commands</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\getmit.hpp">
@@ -407,6 +389,9 @@
     <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\transfermit.hpp">
       <Filter>Header Files\extensions\commands</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\commands\swaptoken.hpp">
+      <Filter>Header Files\extensions\commands</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\include\metaverse\explorer\impl\utility.ipp">
@@ -528,7 +513,7 @@
     <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\dumpkeyfile.cpp">
       <Filter>Source Files\extensions\commands</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\didsendmore.cpp">
+    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\sendmore.cpp">
       <Filter>Source Files\extensions\commands</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\getaccount.cpp">
@@ -537,6 +522,9 @@
     <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\getaccountasset.cpp">
       <Filter>Source Files\extensions\commands</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\getassetview.cpp">
+      <Filter>Source Files\extensions\commands</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\getaddressasset.cpp">
       <Filter>Source Files\extensions\commands</Filter>
     </ClCompile>
@@ -609,30 +597,9 @@
     <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\listtxs.cpp">
       <Filter>Source Files\extensions\commands</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\send.cpp">
-      <Filter>Source Files\extensions\commands</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\sendasset.cpp">
-      <Filter>Source Files\extensions\commands</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\sendassetfrom.cpp">
-      <Filter>Source Files\extensions\commands</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\sendfrom.cpp">
-      <Filter>Source Files\extensions\commands</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\sendmore.cpp">
-      <Filter>Source Files\extensions\commands</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\sendrawtx.cpp">
       <Filter>Source Files\extensions\commands</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\sendwithmsg.cpp">
-      <Filter>Source Files\extensions\commands</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\sendwithmsgfrom.cpp">
-      <Filter>Source Files\extensions\commands</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\setminingaccount.cpp">
       <Filter>Source Files\extensions\commands</Filter>
     </ClCompile>
@@ -741,16 +708,16 @@
     <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\issuecert.cpp">
       <Filter>Source Files\extensions\commands</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\didsend.cpp">
+    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\send.cpp">
       <Filter>Source Files\extensions\commands</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\didsendasset.cpp">
+    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\sendasset.cpp">
       <Filter>Source Files\extensions\commands</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\didsendassetfrom.cpp">
+    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\sendassetfrom.cpp">
       <Filter>Source Files\extensions\commands</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\didsendfrom.cpp">
+    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\sendfrom.cpp">
       <Filter>Source Files\extensions\commands</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\registerdid.cpp">
@@ -771,5 +738,13 @@
     <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\transfermit.cpp">
       <Filter>Source Files\extensions\commands</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\lib\explorer\extensions\commands\swaptoken.cpp">
+      <Filter>Source Files\extensions\commands</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="..\..\..\include\CMakeLists.txt">
+      <Filter>Header Files\extensions\commands</Filter>
+    </Text>
   </ItemGroup>
 </Project>
diff --git a/builds/msvc/vs2015/metaverse.vcxproj b/builds/msvc/vs2015/metaverse.vcxproj
@@ -283,6 +283,7 @@
     <ClCompile Include="..\..\..\src\lib\explorer\extensions\wallet\xfetchbalance.cpp" />
     <ClCompile Include="..\..\..\src\lib\explorer\extensions\wallet\sendwithmsgfrom.cpp" />
     <ClCompile Include="..\..\..\src\lib\explorer\extensions\wallet\getaccountasset.cpp" />
+    <ClCompile Include="..\..\..\src\lib\explorer\extensions\wallet\getassetview.cpp" />
     <ClCompile Include="..\..\..\src\lib\explorer\extensions\wallet\listassets.cpp" />
     <ClCompile Include="..\..\..\src\lib\explorer\extensions\wallet\getaddresstx.cpp" />
     <ClCompile Include="..\..\..\src\lib\explorer\extensions\wallet\lockaccount.cpp" />
@@ -849,6 +850,7 @@
     <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\wallet\getbusinessbytime.hpp" />
     <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\wallet\gettransaction.hpp" />
     <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\wallet\getaccountasset.hpp" />
+    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\wallet\getassetview.hpp" />
     <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\wallet\settxfee.hpp" />
     <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\wallet\sendfrom.hpp" />
     <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\wallet\backupaccount.hpp" />

diff --git a/builds/msvc/vs2015/metaverse.vcxproj.filters b/builds/msvc/vs2015/metaverse.vcxproj.filters
@@ -498,6 +498,9 @@
     <ClCompile Include="..\..\..\src\lib\explorer\extensions\wallet\getaccountasset.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\lib\explorer\extensions\wallet\getassetview.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\src\lib\explorer\extensions\wallet\listassets.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -2207,6 +2210,9 @@
     <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\wallet\getaccountasset.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\wallet\getassetview.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\include\metaverse\explorer\extensions\wallet\settxfee.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>

diff --git a/include/metaverse/bitcoin/chain/attachment/asset/asset_cert.hpp b/include/metaverse/bitcoin/chain/attachment/asset/asset_cert.hpp
@@ -52,6 +52,10 @@ namespace asset_cert_ns {
     constexpr asset_cert_type issue         = 1;
     constexpr asset_cert_type domain        = 2;
     constexpr asset_cert_type naming        = 3;
+
+    constexpr asset_cert_type custom        = 0x80000000;
+    constexpr asset_cert_type marriage      = custom + 0;
+    constexpr asset_cert_type kyc           = custom + 1;
 }
 
 class BC_API asset_cert