projects
/
ldk-java
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update auto-updated Java files
[ldk-java]
/
src
/
main
/
java
/
org
/
ldk
/
structs
/
Filter.java
diff --git
a/src/main/java/org/ldk/structs/Filter.java
b/src/main/java/org/ldk/structs/Filter.java
index 701e70f5c0ad06ff894c34aada3f4e38b437348f..5503b7978d9f2725e0f7e9753286c2cda5f1d7b2 100644
(file)
--- a/
src/main/java/org/ldk/structs/Filter.java
+++ b/
src/main/java/org/ldk/structs/Filter.java
@@
-4,6
+4,7
@@
import org.ldk.impl.bindings;
import org.ldk.enums.*;
import org.ldk.util.*;
import java.util.Arrays;
import org.ldk.enums.*;
import org.ldk.util.*;
import java.util.Arrays;
+import java.lang.ref.Reference;
import javax.annotation.Nullable;
/**
import javax.annotation.Nullable;
/**
@@
-24,7
+25,7
@@
import javax.annotation.Nullable;
* processed later. Then, in order to block until the data has been processed, any [`Watch`]
* invocation that has called the `Filter` must return [`TemporaryFailure`].
*
* processed later. Then, in order to block until the data has been processed, any [`Watch`]
* invocation that has called the `Filter` must return [`TemporaryFailure`].
*
- * [`TemporaryFailure`]:
channelmonitor::
ChannelMonitorUpdateErr::TemporaryFailure
+ * [`TemporaryFailure`]: ChannelMonitorUpdateErr::TemporaryFailure
* [BIP 157]: https://github.com/bitcoin/bips/blob/master/bip-0157.mediawiki
* [BIP 158]: https://github.com/bitcoin/bips/blob/master/bip-0158.mediawiki
*/
* [BIP 157]: https://github.com/bitcoin/bips/blob/master/bip-0157.mediawiki
* [BIP 158]: https://github.com/bitcoin/bips/blob/master/bip-0158.mediawiki
*/
@@
-69,10
+70,10
@@
public class Filter extends CommonBase {
arg.register_tx(txid, script_pubkey);
}
@Override public long register_output(long output) {
arg.register_tx(txid, script_pubkey);
}
@Override public long register_output(long output) {
- WatchedOutput output_hu_conv = n
ew WatchedOutput(null, output);
+ WatchedOutput output_hu_conv = n
ull; if (output < 0 || output > 4096) { output_hu_conv = new WatchedOutput(null, output); }
output_hu_conv.ptrs_to.add(this);
Option_C2Tuple_usizeTransactionZZ ret = arg.register_output(output_hu_conv);
output_hu_conv.ptrs_to.add(this);
Option_C2Tuple_usizeTransactionZZ ret = arg.register_output(output_hu_conv);
- long result = ret
.ptr
;
+ long result = ret
== null ? 0 : ret.clone_ptr()
;
return result;
}
});
return result;
}
});
@@
-83,7
+84,10
@@
public class Filter extends CommonBase {
* a spending condition.
*/
public void register_tx(byte[] txid, byte[] script_pubkey) {
* a spending condition.
*/
public void register_tx(byte[] txid, byte[] script_pubkey) {
- bindings.Filter_register_tx(this.ptr, txid, script_pubkey);
+ bindings.Filter_register_tx(this.ptr, InternalUtils.check_arr_len(txid, 32), script_pubkey);
+ Reference.reachabilityFence(this);
+ Reference.reachabilityFence(txid);
+ Reference.reachabilityFence(script_pubkey);
}
/**
}
/**
@@
-99,10
+103,11
@@
public class Filter extends CommonBase {
*/
public Option_C2Tuple_usizeTransactionZZ register_output(WatchedOutput output) {
long ret = bindings.Filter_register_output(this.ptr, output == null ? 0 : output.ptr & ~1);
*/
public Option_C2Tuple_usizeTransactionZZ register_output(WatchedOutput output) {
long ret = bindings.Filter_register_output(this.ptr, output == null ? 0 : output.ptr & ~1);
- if (ret < 1024) { return null; }
+ Reference.reachabilityFence(this);
+ Reference.reachabilityFence(output);
+ if (ret >= 0 && ret <= 4096) { return null; }
Option_C2Tuple_usizeTransactionZZ ret_hu_conv = Option_C2Tuple_usizeTransactionZZ.constr_from_ptr(ret);
ret_hu_conv.ptrs_to.add(this);
Option_C2Tuple_usizeTransactionZZ ret_hu_conv = Option_C2Tuple_usizeTransactionZZ.constr_from_ptr(ret);
ret_hu_conv.ptrs_to.add(this);
- this.ptrs_to.add(output);
return ret_hu_conv;
}
return ret_hu_conv;
}