Merge pull request #155 from TheBlueMatt/main

TheBlueMatt · web-flow · commit e434f3b33ec6 · 2024-03-20T16:02:30.000Z
Cut 0.0.121.3
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -576,7 +576,7 @@ jobs:
   android:
     runs-on: ubuntu-latest
     # Frankly, I'm not really sure why debian and ubuntu differ in the results here, they really shouldn't
-    container: debian:bullseye
+    container: debian:bookworm
     strategy:
       fail-fast: false
     steps:
diff --git a/genbindings.sh b/genbindings.sh
@@ -81,10 +81,12 @@ fi
 
 COMMON_COMPILE="$CC -std=c11 -Wall -Wextra -Wno-unused-parameter -Wno-ignored-qualifiers -Wno-unused-function -Wno-nullability-completeness -Wno-pointer-sign -Wdate-time -ffile-prefix-map=$(pwd)="
 COMMON_CC=""
-if [[ "$TARGET_STRING" != *"android" ]]; then
-	[[ "$TARGET_STRING" != "x86"* ]] && COMMON_CC="$COMMON_CC --target=$TARGET_STRING -mcpu=$LDK_TARGET_CPU"
-	[[ "$TARGET_STRING" = "x86"* ]] && COMMON_CC="$COMMON_CC --target=$TARGET_STRING -march=$LDK_TARGET_CPU -mtune=$LDK_TARGET_CPU"
+if [[ "$TARGET_STRING" != *"android" && "$TARGET_STRING" != *"androideabi" ]]; then
+	[[ "$TARGET_STRING" != "x86"* ]] && COMMON_CC="$COMMON_CC --target=$TARGET_STRING"
+	[[ "$TARGET_STRING" = "x86"* ]] && COMMON_CC="$COMMON_CC --target=$TARGET_STRING"
 fi
+[[ "$TARGET_STRING" != "x86"* ]] && COMMON_CC="$COMMON_CC -mcpu=$LDK_TARGET_CPU"
+[[ "$TARGET_STRING" = "x86"* ]] && COMMON_CC="$COMMON_CC -march=$LDK_TARGET_CPU -mtune=$LDK_TARGET_CPU"
 [ "$IS_MAC" = "true" -a "$MACOS_SDK" != "" ] && COMMON_COMPILE="$COMMON_COMPILE -isysroot $MACOS_SDK"
 
 DEBUG_ARG="$3"
diff --git a/src/main/java/org/ldk/enums/BlindedFailure.java b/src/main/java/org/ldk/enums/BlindedFailure.java
@@ -16,5 +16,5 @@ public enum BlindedFailure {
 	 */
 	LDKBlindedFailure_FromBlindedNode,
 	; static native void init();
-	static { init(); }
+	static { org.ldk.impl.bindings.run_statics(); init(); }
 }
diff --git a/src/main/java/org/ldk/enums/Bolt11SemanticError.java b/src/main/java/org/ldk/enums/Bolt11SemanticError.java
@@ -47,5 +47,5 @@ public enum Bolt11SemanticError {
 	 */
 	LDKBolt11SemanticError_ImpreciseAmount,
 	; static native void init();
-	static { init(); }
+	static { org.ldk.impl.bindings.run_statics(); init(); }
 }
diff --git a/src/main/java/org/ldk/enums/Bolt12SemanticError.java b/src/main/java/org/ldk/enums/Bolt12SemanticError.java
@@ -113,5 +113,5 @@ public enum Bolt12SemanticError {
 	 */
 	LDKBolt12SemanticError_MissingSignature,
 	; static native void init();
-	static { init(); }
+	static { org.ldk.impl.bindings.run_statics(); init(); }
 }
diff --git a/src/main/java/org/ldk/enums/COption_NoneZ.java b/src/main/java/org/ldk/enums/COption_NoneZ.java
@@ -13,5 +13,5 @@ public enum COption_NoneZ {
 	 */
 	LDKCOption_NoneZ_None,
 	; static native void init();
-	static { init(); }
+	static { org.ldk.impl.bindings.run_statics(); init(); }
 }
diff --git a/src/main/java/org/ldk/enums/ChannelMonitorUpdateStatus.java b/src/main/java/org/ldk/enums/ChannelMonitorUpdateStatus.java
@@ -74,5 +74,5 @@ public enum ChannelMonitorUpdateStatus {
 	 */
 	LDKChannelMonitorUpdateStatus_UnrecoverableError,
 	; static native void init();
-	static { init(); }
+	static { org.ldk.impl.bindings.run_statics(); init(); }
 }
diff --git a/src/main/java/org/ldk/enums/ChannelShutdownState.java b/src/main/java/org/ldk/enums/ChannelShutdownState.java
@@ -32,5 +32,5 @@ public enum ChannelShutdownState {
 	 */
 	LDKChannelShutdownState_ShutdownComplete,
 	; static native void init();
-	static { init(); }
+	static { org.ldk.impl.bindings.run_statics(); init(); }
 }
diff --git a/src/main/java/org/ldk/enums/ConfirmationTarget.java b/src/main/java/org/ldk/enums/ConfirmationTarget.java
@@ -93,5 +93,5 @@ public enum ConfirmationTarget {
 	 */
 	LDKConfirmationTarget_ChannelCloseMinimum,
 	; static native void init();
-	static { init(); }
+	static { org.ldk.impl.bindings.run_statics(); init(); }
 }
diff --git a/src/main/java/org/ldk/enums/CreationError.java b/src/main/java/org/ldk/enums/CreationError.java
@@ -34,5 +34,5 @@ public enum CreationError {
 	 */
 	LDKCreationError_MinFinalCltvExpiryDeltaTooShort,
 	; static native void init();
-	static { init(); }
+	static { org.ldk.impl.bindings.run_statics(); init(); }
 }
diff --git a/src/main/java/org/ldk/enums/Currency.java b/src/main/java/org/ldk/enums/Currency.java
@@ -25,5 +25,5 @@ public enum Currency {
 	 */
 	LDKCurrency_Signet,
 	; static native void init();
-	static { init(); }
+	static { org.ldk.impl.bindings.run_statics(); init(); }
 }
diff --git a/src/main/java/org/ldk/enums/HTLCClaim.java b/src/main/java/org/ldk/enums/HTLCClaim.java
@@ -25,5 +25,5 @@ public enum HTLCClaim {
 	 */
 	LDKHTLCClaim_Revocation,
 	; static native void init();
-	static { init(); }
+	static { org.ldk.impl.bindings.run_statics(); init(); }
 }
diff --git a/src/main/java/org/ldk/enums/IOError.java b/src/main/java/org/ldk/enums/IOError.java
@@ -23,5 +23,5 @@ public enum IOError {
 	LDKIOError_Other,
 	LDKIOError_UnexpectedEof,
 	; static native void init();
-	static { init(); }
+	static { org.ldk.impl.bindings.run_statics(); init(); }
 }
diff --git a/src/main/java/org/ldk/enums/Level.java b/src/main/java/org/ldk/enums/Level.java
@@ -29,5 +29,5 @@ public enum Level {
 	 */
 	LDKLevel_Error,
 	; static native void init();
-	static { init(); }
+	static { org.ldk.impl.bindings.run_statics(); init(); }
 }
diff --git a/src/main/java/org/ldk/enums/Network.java b/src/main/java/org/ldk/enums/Network.java
@@ -21,5 +21,5 @@ public enum Network {
 	 */
 	LDKNetwork_Signet,
 	; static native void init();
-	static { init(); }
+	static { org.ldk.impl.bindings.run_statics(); init(); }
 }
diff --git a/src/main/java/org/ldk/enums/PaymentFailureReason.java b/src/main/java/org/ldk/enums/PaymentFailureReason.java
@@ -40,5 +40,5 @@ public enum PaymentFailureReason {
 	 */
 	LDKPaymentFailureReason_UnexpectedError,
 	; static native void init();
-	static { init(); }
+	static { org.ldk.impl.bindings.run_statics(); init(); }
 }
diff --git a/src/main/java/org/ldk/enums/Recipient.java b/src/main/java/org/ldk/enums/Recipient.java
@@ -19,5 +19,5 @@ public enum Recipient {
 	 */
 	LDKRecipient_PhantomNode,
 	; static native void init();
-	static { init(); }
+	static { org.ldk.impl.bindings.run_statics(); init(); }
 }
diff --git a/src/main/java/org/ldk/enums/RetryableSendFailure.java b/src/main/java/org/ldk/enums/RetryableSendFailure.java
@@ -30,5 +30,5 @@ public enum RetryableSendFailure {
 	 */
 	LDKRetryableSendFailure_DuplicatePayment,
 	; static native void init();
-	static { init(); }
+	static { org.ldk.impl.bindings.run_statics(); init(); }
 }
diff --git a/src/main/java/org/ldk/enums/Secp256k1Error.java b/src/main/java/org/ldk/enums/Secp256k1Error.java
@@ -49,5 +49,5 @@ public enum Secp256k1Error {
 	 */
 	LDKSecp256k1Error_InvalidParityValue,
 	; static native void init();
-	static { init(); }
+	static { org.ldk.impl.bindings.run_statics(); init(); }
 }
diff --git a/src/main/java/org/ldk/enums/SiPrefix.java b/src/main/java/org/ldk/enums/SiPrefix.java
@@ -21,5 +21,5 @@ public enum SiPrefix {
 	 */
 	LDKSiPrefix_Pico,
 	; static native void init();
-	static { init(); }
+	static { org.ldk.impl.bindings.run_statics(); init(); }
 }
diff --git a/src/main/java/org/ldk/enums/SocketAddressParseError.java b/src/main/java/org/ldk/enums/SocketAddressParseError.java
@@ -21,5 +21,5 @@ public enum SocketAddressParseError {
 	 */
 	LDKSocketAddressParseError_InvalidOnionV3,
 	; static native void init();
-	static { init(); }
+	static { org.ldk.impl.bindings.run_statics(); init(); }
 }
diff --git a/src/main/java/org/ldk/enums/UtxoLookupError.java b/src/main/java/org/ldk/enums/UtxoLookupError.java
@@ -13,5 +13,5 @@ public enum UtxoLookupError {
 	 */
 	LDKUtxoLookupError_UnknownTx,
 	; static native void init();
-	static { init(); }
+	static { org.ldk.impl.bindings.run_statics(); init(); }
 }
diff --git a/src/main/java/org/ldk/impl/bindings.java b/src/main/java/org/ldk/impl/bindings.java
@@ -38,6 +38,7 @@ public class bindings {
 		// Fetching the LDK versions from C also checks that the header and binaries match
 		System.err.println("Loaded LDK-Java Bindings " + version.get_ldk_java_bindings_version() + " with LDK " + get_ldk_version() + " and LDK-C-Bindings " + get_ldk_c_bindings_version());
 	}
+	public static void run_statics() { /* Useful to force the statics to run */ }
 	static native void init(java.lang.Class c);
 	static native void init_class_cache();
 	static native String get_lib_version_string();

Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,5 @@ public enum BlindedFailure {`
`16`	`16`	`*/`
`17`	`17`	`LDKBlindedFailure_FromBlindedNode,`
`18`	`18`	`; static native void init();`
`19`		`- static { init(); }`
	`19`	`+ static { org.ldk.impl.bindings.run_statics(); init(); }`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,5 +47,5 @@ public enum Bolt11SemanticError {`
`47`	`47`	`*/`
`48`	`48`	`LDKBolt11SemanticError_ImpreciseAmount,`
`49`	`49`	`; static native void init();`
`50`		`- static { init(); }`
	`50`	`+ static { org.ldk.impl.bindings.run_statics(); init(); }`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,5 +113,5 @@ public enum Bolt12SemanticError {`
`113`	`113`	`*/`
`114`	`114`	`LDKBolt12SemanticError_MissingSignature,`
`115`	`115`	`; static native void init();`
`116`		`- static { init(); }`
	`116`	`+ static { org.ldk.impl.bindings.run_statics(); init(); }`
`117`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@ public enum COption_NoneZ {`
`13`	`13`	`*/`
`14`	`14`	`LDKCOption_NoneZ_None,`
`15`	`15`	`; static native void init();`
`16`		`- static { init(); }`
	`16`	`+ static { org.ldk.impl.bindings.run_statics(); init(); }`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,5 +74,5 @@ public enum ChannelMonitorUpdateStatus {`
`74`	`74`	`*/`
`75`	`75`	`LDKChannelMonitorUpdateStatus_UnrecoverableError,`
`76`	`76`	`; static native void init();`
`77`		`- static { init(); }`
	`77`	`+ static { org.ldk.impl.bindings.run_statics(); init(); }`
`78`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,5 +32,5 @@ public enum ChannelShutdownState {`
`32`	`32`	`*/`
`33`	`33`	`LDKChannelShutdownState_ShutdownComplete,`
`34`	`34`	`; static native void init();`
`35`		`- static { init(); }`
	`35`	`+ static { org.ldk.impl.bindings.run_statics(); init(); }`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,5 +93,5 @@ public enum ConfirmationTarget {`
`93`	`93`	`*/`
`94`	`94`	`LDKConfirmationTarget_ChannelCloseMinimum,`
`95`	`95`	`; static native void init();`
`96`		`- static { init(); }`
	`96`	`+ static { org.ldk.impl.bindings.run_statics(); init(); }`
`97`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,5 +34,5 @@ public enum CreationError {`
`34`	`34`	`*/`
`35`	`35`	`LDKCreationError_MinFinalCltvExpiryDeltaTooShort,`
`36`	`36`	`; static native void init();`
`37`		`- static { init(); }`
	`37`	`+ static { org.ldk.impl.bindings.run_statics(); init(); }`
`38`	`38`	`}`