Merge pull request #2551 from bitshares/testnet_release

Merge release branch into testnet branch
bitshares · Dec 12, 2021 · e6e687a · e6e687a
2 parents 08e62a2 + 162f35c
commit e6e687a
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
@@ -44,6 +44,7 @@ Anzhy Cherrnyavski <[email protected]>
 Tengfei Niu <[email protected]>
 Tiago Peralta <[email protected]>
 ioBanker <[email protected]>
+xiao93 <[email protected]>
 Karl Semich <[email protected]>
 SahkanDesertHawk <[email protected]>
 Scott Howard <[email protected]>
@@ -55,7 +56,6 @@ d.yakovitsky <[email protected]>
 ddylko <ddylko@ddylkoPC>
 iHashFury <[email protected]>
 necklace <[email protected]>
-xiao93 <[email protected]>
 xuquan316 <[email protected]>
 Bartek Wrona <[email protected]>
 BhuzOr <[email protected]>

diff --git a/Doxyfile b/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = "BitShares-Core"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "5.2.1"
+PROJECT_NUMBER         = "6.0.0"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/README.md b/README.md
@@ -236,7 +236,7 @@ The `cli_wallet` program can also be configured to serve **all of its commands**
 
 Start `cli_wallet` with RPC connection enabled:
 
-    $ ./programs/cli_wallet/cli_wallet --rpc-endpoint=127.0.0.8091
+    $ ./programs/cli_wallet/cli_wallet --rpc-endpoint=127.0.0.1:8091
 
 Access the wallet API using an HTTP client:
 

diff --git a/docs b/docs
diff --git a/libraries/protocol/asset.cpp b/libraries/protocol/asset.cpp
@@ -149,6 +149,7 @@ namespace graphene { namespace protocol {
          {
             uint128_t num = ocp.numerator();
             uint128_t den = ocp.denominator();
+            FC_ASSERT( num > 0 && den > 0, "Internal error" );
             if( num > den )
             {
                num /= den;

diff --git a/libraries/protocol/include/graphene/protocol/types.hpp b/libraries/protocol/include/graphene/protocol/types.hpp
@@ -174,15 +174,18 @@ enum asset_issuer_permission_flags {
     /// @note These parameters are for issuer permission only.
     ///       For each parameter, if it is set in issuer permission,
     ///       it means the bitasset owner can not update the corresponding parameter.
-    ///       In this case, if the value of the parameter was set by the bitasset owner, it can not be updated;
-    ///       if no value was set by the owner, the value can still be updated by the feed producers.
     ///@{
-    disable_mcr_update   = 0x800, ///< the bitasset owner can not update MCR, permisison only
-    disable_icr_update   = 0x1000, ///< the bitasset owner can not update ICR, permisison only
-    disable_mssr_update  = 0x2000, ///< the bitasset owner can not update MSSR, permisison only
+    /// @note For each one of these parameters, if it is set in issuer permission, and
+    ///       * if the value of the parameter was set by the bitasset owner, it can not be updated,
+    ///       * if no value was set by the owner, the value can still be updated by the feed producers.
+    ///@{
+    disable_mcr_update   = 0x800, ///< the bitasset owner can not update MCR, permission only
+    disable_icr_update   = 0x1000, ///< the bitasset owner can not update ICR, permission only
+    disable_mssr_update  = 0x2000, ///< the bitasset owner can not update MSSR, permission only
+    ///@}
     disable_bsrm_update  = 0x4000, ///< the bitasset owner can not update BSRM, permission only
-    disable_collateral_bidding = 0x8000  ///< Can not bid collateral after a global settlement
     ///@}
+    disable_collateral_bidding = 0x8000  ///< Can not bid collateral after a global settlement
     ///@}
 };