File tree Expand file tree Collapse file tree 3 files changed +7
-2
lines changed Expand file tree Collapse file tree 3 files changed +7
-2
lines changed Original file line number Diff line number Diff line change @@ -55,7 +55,7 @@ static const unsigned int MAX_STANDARD_SCRIPTSIG_SIZE = 1650;
55
55
* standard and should be done with care and ideally rarely. It makes sense to
56
56
* only increase the dust limit after prior releases were already not creating
57
57
* outputs below the new threshold */
58
- static const unsigned int DUST_RELAY_TX_FEE = 3000 ;
58
+ static const unsigned int DUST_RELAY_TX_FEE = 100 ;
59
59
/* *
60
60
* Standard script verification flags that standard transactions will comply
61
61
* with. However scripts violating these flags may still be present in valid
@@ -89,6 +89,9 @@ static constexpr unsigned int STANDARD_NOT_MANDATORY_VERIFY_FLAGS = STANDARD_SCR
89
89
static constexpr unsigned int STANDARD_LOCKTIME_VERIFY_FLAGS = LOCKTIME_VERIFY_SEQUENCE |
90
90
LOCKTIME_MEDIAN_TIME_PAST;
91
91
92
+ // ELEMENTS: keep a copy of the upstream default dust relay fee rate
93
+ static const unsigned int DUST_RELAY_TX_FEE_BITCOIN = 3000 ;
94
+
92
95
CAmount GetDustThreshold (const CTxOut& txout, const CFeeRate& dustRelayFee);
93
96
94
97
bool IsDust (const CTxOut& txout, const CFeeRate& dustRelayFee);
Original file line number Diff line number Diff line change @@ -795,6 +795,7 @@ BOOST_AUTO_TEST_CASE(test_IsStandard)
795
795
CheckIsStandard (t);
796
796
797
797
// Check dust with default relay fee:
798
+ dustRelayFee = CFeeRate (DUST_RELAY_TX_FEE_BITCOIN); // ELEMENTS: use the Bitcoin default dust relay feerate
798
799
CAmount nDustThreshold = 182 * dustRelayFee.GetFeePerK () / 1000 ;
799
800
BOOST_CHECK_EQUAL (nDustThreshold, 546 );
800
801
// dust:
@@ -830,7 +831,7 @@ BOOST_AUTO_TEST_CASE(test_IsStandard)
830
831
// not dust:
831
832
t.vout [0 ].nValue = 674 ;
832
833
CheckIsStandard (t);
833
- dustRelayFee = CFeeRate (DUST_RELAY_TX_FEE);
834
+ dustRelayFee = CFeeRate (DUST_RELAY_TX_FEE_BITCOIN); // ELEMENTS: use the Bitcoin default dust relay feerate
834
835
835
836
t.vout [0 ].scriptPubKey = CScript () << OP_1;
836
837
CheckIsNotStandard (t, " scriptpubkey" );
Original file line number Diff line number Diff line change @@ -46,6 +46,7 @@ def set_test_params(self):
46
46
'-txindex' ,
47
47
'-txindex' ,'-permitbaremultisig=0' ,
48
48
'-multi_data_permitted=1' , # Elements test
49
+ '-dustrelayfee=0.00003000' , # ELEMENTS: use the Bitcoin default dust relay fee rate
49
50
]] * self .num_nodes
50
51
self .supports_cli = False
51
52
You can’t perform that action at this time.
0 commit comments