Transaction.updateConfidenceId()

oscarguindzberg · Apr 26, 2019 · c5f2120 · c5f2120
1 parent 9552da9
commit c5f2120
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 2 deletions.
diff --git a/core/src/main/java/org/bitcoinj/core/Transaction.java b/core/src/main/java/org/bitcoinj/core/Transaction.java
@@ -554,7 +554,12 @@ protected void unCache() {
         super.unCache();
         cachedTxId = null;
         cachedWTxId = null;
-        confidence = null;
+    }
+
+    protected void updateConfidenceId() {
+        if (confidence != null) {
+            Context.get().getConfidenceTable().updateTxId(confidence, this.getTxId());
+        }
     }
 
     protected static int calcLength(byte[] buf, int offset) {
@@ -882,6 +887,7 @@ public void clearInputs() {
         inputs.clear();
         // You wanted to reserialize, right?
         this.length = this.unsafeBitcoinSerialize().length;
+        updateConfidenceId();
     }
 
     /**
@@ -904,6 +910,7 @@ public TransactionInput addInput(TransactionInput input) {
         input.setParent(this);
         inputs.add(input);
         adjustLength(inputs.size(), input.length);
+        updateConfidenceId();
         return input;
     }
 
@@ -989,6 +996,7 @@ public void clearOutputs() {
         outputs.clear();
         // You wanted to reserialize, right?
         this.length = this.unsafeBitcoinSerialize().length;
+        updateConfidenceId();
     }
 
     /**
@@ -999,6 +1007,7 @@ public TransactionOutput addOutput(TransactionOutput to) {
         to.setParent(this);
         outputs.add(to);
         adjustLength(outputs.size(), to.length);
+        updateConfidenceId();
         return to;
     }
 
@@ -1457,6 +1466,7 @@ public void setLockTime(long lockTime) {
             log.warn("You are setting the lock time on a transaction but none of the inputs have non-default sequence numbers. This will not do what you expect!");
         }
         this.lockTime = lockTime;
+        updateConfidenceId();
     }
 
     public long getVersion() {
@@ -1466,6 +1476,7 @@ public long getVersion() {
     public void setVersion(int version) {
         this.version = version;
         unCache();
+        updateConfidenceId();
     }
 
     /** Returns an unmodifiable view of all inputs. */

diff --git a/core/src/main/java/org/bitcoinj/core/TransactionConfidence.java b/core/src/main/java/org/bitcoinj/core/TransactionConfidence.java
@@ -76,7 +76,7 @@ public TransactionConfidence createConfidence(Sha256Hash hash) {
     /** The time the transaction was last announced to us. */
     private Date lastBroadcastedAt;
     /** The Transaction that this confidence object is associated with. */
-    private final Sha256Hash hash;
+    private Sha256Hash hash;
     // Lazily created listeners array.
     private CopyOnWriteArrayList<ListenerRegistration<Listener>> listeners;
 
@@ -514,4 +514,8 @@ public synchronized ListenableFuture<TransactionConfidence> getDepthFuture(final
     public Sha256Hash getTransactionHash() {
         return hash;
     }
+
+    public void updateTransactionHash(Sha256Hash hash) {
+        this.hash = hash;
+    }
 }
diff --git a/core/src/main/java/org/bitcoinj/core/TransactionInput.java b/core/src/main/java/org/bitcoinj/core/TransactionInput.java
@@ -225,6 +225,7 @@ public long getSequenceNumber() {
     public void setSequenceNumber(long sequence) {
         unCache();
         this.sequence = sequence;
+        updateTransactionConfidenceId();
     }
 
     /**
@@ -261,6 +262,7 @@ void setScriptBytes(byte[] scriptBytes) {
         // 40 = previous_outpoint (36) + sequence (4)
         int newLength = 40 + (scriptBytes == null ? 1 : VarInt.sizeOf(scriptBytes.length) + scriptBytes.length);
         adjustLength(newLength - oldLength);
+        updateTransactionConfidenceId();
     }
 
     /**
@@ -294,6 +296,12 @@ public void setWitness(TransactionWitness witness) {
         this.witness = witness;
     }
 
+    private void updateTransactionConfidenceId() {
+        if (parent != null) {
+            getParentTransaction().updateConfidenceId();
+        }
+    }
+
     /**
      * Determine if the transaction has witnesses.
      * 

diff --git a/core/src/main/java/org/bitcoinj/core/TransactionOutput.java b/core/src/main/java/org/bitcoinj/core/TransactionOutput.java
@@ -170,6 +170,7 @@ public void setValue(Coin value) {
         checkNotNull(value);
         unCache();
         this.value = value.value;
+        updateTransactionConfidenceId();
     }
 
     /**
@@ -226,6 +227,13 @@ public Coin getMinNonDustValue() {
         return getMinNonDustValue(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE.multiply(3));
     }
 
+    private void updateTransactionConfidenceId() {
+        if (parent != null) {
+            getParentTransaction().updateConfidenceId();
+        }
+    }
+
+
     /**
      * Sets this objects availableForSpending flag to false and the spentBy pointer to the given input.
      * If the input is null, it means this output was signed over to somebody else rather than one of our own keys.

diff --git a/core/src/main/java/org/bitcoinj/core/TxConfidenceTable.java b/core/src/main/java/org/bitcoinj/core/TxConfidenceTable.java
@@ -39,6 +39,13 @@
 public class TxConfidenceTable {
     protected ReentrantLock lock = Threading.lock("txconfidencetable");
 
+    public void updateTxId(TransactionConfidence confidence, Sha256Hash newTxId) {
+        WeakConfidenceReference wcr = table.remove(confidence.getTransactionHash());
+        //wcr.get().updateTransactionHash(newTxId);
+        confidence.updateTransactionHash(newTxId);
+        table.put(newTxId, wcr);
+    }
+
     private static class WeakConfidenceReference extends WeakReference<TransactionConfidence> {
         public Sha256Hash hash;
         public WeakConfidenceReference(TransactionConfidence confidence, ReferenceQueue<TransactionConfidence> queue) {