Exclude OP_RETURN from the MIN_ANALYSIS_NONDUST_OUTPUT check

Cherry pick bisq-network@620e36f
oscarguindzberg · Jan 3, 2019 · cf220c4 · cf220c4
1 parent 35ffbf9
commit cf220c4
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/core/src/main/java/org/bitcoinj/wallet/DefaultRiskAnalysis.java b/core/src/main/java/org/bitcoinj/wallet/DefaultRiskAnalysis.java
@@ -172,7 +172,9 @@ public static RuleViolation isStandard(Transaction tx) {
      * Checks the output to see if the script violates a standardness rule. Not complete.
      */
     public static RuleViolation isOutputStandard(TransactionOutput output) {
-        if (output.getValue().compareTo(MIN_ANALYSIS_NONDUST_OUTPUT) < 0)
+        // OP_RETURN has usually output value zero, so we exclude that from the MIN_ANALYSIS_NONDUST_OUTPUT check
+        if (!output.getScriptPubKey().isOpReturn() 
+                && output.getValue().compareTo(MIN_ANALYSIS_NONDUST_OUTPUT) < 0)
             return RuleViolation.DUST;
         for (ScriptChunk chunk : output.getScriptPubKey().getChunks()) {
             if (chunk.isPushData() && !chunk.isShortestPossiblePushData())