Merge pull request #2140 from bitshares/jmj_bsip86_30pct

BSIP 86 Fee max of 30%
bitshares · Apr 27, 2020 · 0b0d7e9 · 0b0d7e9
2 parents 9f4c786 + 09970f6
commit 0b0d7e9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/libraries/protocol/chain_parameters.cpp b/libraries/protocol/chain_parameters.cpp
@@ -103,8 +103,8 @@ namespace graphene { namespace protocol {
                  "Committee proposal review period must be less than the maximum proposal lifetime" );
       if( extensions.value.market_fee_network_percent.valid() )
       {
-         FC_ASSERT( *extensions.value.market_fee_network_percent <= GRAPHENE_100_PERCENT,
-                    "The market_fee_network_percent parameter can not exceed 100%" );
+         FC_ASSERT( *extensions.value.market_fee_network_percent <= 3000, // GRAPHENE_100_PERCENT is 10000
+                    "The market_fee_network_percent parameter can not exceed 30%" );
       }
       if( extensions.value.maker_fee_discount_percent.valid() )
       {

diff --git a/tests/tests/bsip86_tests.cpp b/tests/tests/bsip86_tests.cpp
@@ -74,7 +74,7 @@ BOOST_AUTO_TEST_CASE( hardfork_time_test )
       cop.fee_paying_account = GRAPHENE_TEMP_ACCOUNT;
       cop.expiration_time = db.head_block_time() + *cop.review_period_seconds + 10;
       committee_member_update_global_parameters_operation cmuop;
-      cmuop.new_parameters.extensions.value.market_fee_network_percent = 10001; // 100.01%
+      cmuop.new_parameters.extensions.value.market_fee_network_percent = 3001; // 30.01%
       cop.proposed_ops.emplace_back(cmuop);
       trx.operations.push_back(cop);