Merge pull request #119 from TheBlueMatt/main

[ldk-java] / ts / structs / Persister.mts

diff --git a/ts/structs/Persister.mts b/ts/structs/Persister.mts
index 0a1ef37cf82fcb9ddfb4e2da138e4d286c7636ee..0439d7382d38fbbe42be2444839c7ce3538320f4 100644 (file)
--- a/ts/structs/Persister.mts
+++ b/ts/structs/Persister.mts
@@ -1,4 +1,5 @@
 import { TxOut } from '../structs/TxOut.mjs';
+import { BigEndianScalar } from '../structs/BigEndianScalar.mjs';
 import { AccessError } from '../enums/AccessError.mjs';
 import { COption_NoneZ } from '../enums/COption_NoneZ.mjs';
 import { ChannelMonitorUpdateErr } from '../enums/ChannelMonitorUpdateErr.mjs';
@@ -13,9 +14,14 @@ import { Secp256k1Error } from '../enums/Secp256k1Error.mjs';
 import { SemanticError } from '../enums/SemanticError.mjs';
 import { SiPrefix } from '../enums/SiPrefix.mjs';
 import { Bech32Error } from '../structs/Bech32Error.mjs';
+import { BlindedRoute } from '../structs/BlindedRoute.mjs';
+import { Result_BlindedRouteNoneZ } from '../structs/Result_BlindedRouteNoneZ.mjs';
+import { DecodeError } from '../structs/DecodeError.mjs';
+import { Result_BlindedRouteDecodeErrorZ } from '../structs/Result_BlindedRouteDecodeErrorZ.mjs';
+import { BlindedHop } from '../structs/BlindedHop.mjs';
+import { Result_BlindedHopDecodeErrorZ } from '../structs/Result_BlindedHopDecodeErrorZ.mjs';
 import { Result_NoneNoneZ } from '../structs/Result_NoneNoneZ.mjs';
 import { CounterpartyCommitmentSecrets } from '../structs/CounterpartyCommitmentSecrets.mjs';
-import { DecodeError } from '../structs/DecodeError.mjs';
 import { Result_CounterpartyCommitmentSecretsDecodeErrorZ } from '../structs/Result_CounterpartyCommitmentSecretsDecodeErrorZ.mjs';
 import { Result_SecretKeyErrorZ } from '../structs/Result_SecretKeyErrorZ.mjs';
 import { Result_PublicKeyErrorZ } from '../structs/Result_PublicKeyErrorZ.mjs';
@@ -93,7 +99,6 @@ import { ClosingSigned } from '../structs/ClosingSigned.mjs';
 import { Shutdown } from '../structs/Shutdown.mjs';
 import { ChannelReestablish } from '../structs/ChannelReestablish.mjs';
 import { ChannelAnnouncement } from '../structs/ChannelAnnouncement.mjs';
-import { NodeAnnouncement } from '../structs/NodeAnnouncement.mjs';
 import { ErrorMessage } from '../structs/ErrorMessage.mjs';
 import { WarningMessage } from '../structs/WarningMessage.mjs';
 import { ErrorAction } from '../structs/ErrorAction.mjs';
@@ -108,7 +113,6 @@ import { Result_NoneChannelMonitorUpdateErrZ } from '../structs/Result_NoneChann
 import { HTLCUpdate } from '../structs/HTLCUpdate.mjs';
 import { MonitorEvent } from '../structs/MonitorEvent.mjs';
 import { ThreeTuple_OutPointCVec_MonitorEventZPublicKeyZ } from '../structs/ThreeTuple_OutPointCVec_MonitorEventZPublicKeyZ.mjs';
-import { Option_C2Tuple_usizeTransactionZZ } from '../structs/Option_C2Tuple_usizeTransactionZZ.mjs';
 import { FixedPenaltyScorer } from '../structs/FixedPenaltyScorer.mjs';
 import { Result_FixedPenaltyScorerDecodeErrorZ } from '../structs/Result_FixedPenaltyScorerDecodeErrorZ.mjs';
 import { TwoTuple_u64u64Z } from '../structs/TwoTuple_u64u64Z.mjs';
@@ -134,6 +138,7 @@ import { Access, AccessInterface } from '../structs/Access.mjs';
 import { Option_AccessZ } from '../structs/Option_AccessZ.mjs';
 import { Result_boolLightningErrorZ } from '../structs/Result_boolLightningErrorZ.mjs';
 import { ThreeTuple_ChannelAnnouncementChannelUpdateChannelUpdateZ } from '../structs/ThreeTuple_ChannelAnnouncementChannelUpdateChannelUpdateZ.mjs';
+import { Option_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ } from '../structs/Option_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ.mjs';
 import { Result_NoneLightningErrorZ } from '../structs/Result_NoneLightningErrorZ.mjs';
 import { ChannelUpdateInfo } from '../structs/ChannelUpdateInfo.mjs';
 import { Result_ChannelUpdateInfoDecodeErrorZ } from '../structs/Result_ChannelUpdateInfoDecodeErrorZ.mjs';
@@ -160,6 +165,8 @@ import { Result_SignatureNoneZ } from '../structs/Result_SignatureNoneZ.mjs';
 import { TwoTuple_SignatureSignatureZ } from '../structs/TwoTuple_SignatureSignatureZ.mjs';
 import { Result_C2Tuple_SignatureSignatureZNoneZ } from '../structs/Result_C2Tuple_SignatureSignatureZNoneZ.mjs';
 import { Result_SecretKeyNoneZ } from '../structs/Result_SecretKeyNoneZ.mjs';
+import { Option_ScalarZ } from '../structs/Option_ScalarZ.mjs';
+import { Result_SharedSecretNoneZ } from '../structs/Result_SharedSecretNoneZ.mjs';
 import { ClosingTransaction } from '../structs/ClosingTransaction.mjs';
 import { UnsignedChannelAnnouncement } from '../structs/UnsignedChannelAnnouncement.mjs';
 import { BaseSign, BaseSignInterface } from '../structs/BaseSign.mjs';
@@ -209,6 +216,8 @@ import { Option_TypeZ } from '../structs/Option_TypeZ.mjs';
 import { Result_COption_TypeZDecodeErrorZ } from '../structs/Result_COption_TypeZDecodeErrorZ.mjs';
 import { PaymentError } from '../structs/PaymentError.mjs';
 import { Result_PaymentIdPaymentErrorZ } from '../structs/Result_PaymentIdPaymentErrorZ.mjs';
+import { InFlightHtlcs } from '../structs/InFlightHtlcs.mjs';
+import { Result_InFlightHtlcsDecodeErrorZ } from '../structs/Result_InFlightHtlcsDecodeErrorZ.mjs';
 import { ParseError } from '../structs/ParseError.mjs';
 import { Result_SiPrefixParseErrorZ } from '../structs/Result_SiPrefixParseErrorZ.mjs';
 import { Invoice } from '../structs/Invoice.mjs';
@@ -248,6 +257,8 @@ import { PeerHandleError } from '../structs/PeerHandleError.mjs';
 import { Result_CVec_u8ZPeerHandleErrorZ } from '../structs/Result_CVec_u8ZPeerHandleErrorZ.mjs';
 import { Result_NonePeerHandleErrorZ } from '../structs/Result_NonePeerHandleErrorZ.mjs';
 import { Result_boolPeerHandleErrorZ } from '../structs/Result_boolPeerHandleErrorZ.mjs';
+import { SendError } from '../structs/SendError.mjs';
+import { Result_NoneSendErrorZ } from '../structs/Result_NoneSendErrorZ.mjs';
 import { Result_NoneErrorZ } from '../structs/Result_NoneErrorZ.mjs';
 import { Result_NetAddressDecodeErrorZ } from '../structs/Result_NetAddressDecodeErrorZ.mjs';
 import { UpdateAddHTLC } from '../structs/UpdateAddHTLC.mjs';
@@ -276,6 +287,8 @@ import { UpdateFee } from '../structs/UpdateFee.mjs';
 import { Result_UpdateFeeDecodeErrorZ } from '../structs/Result_UpdateFeeDecodeErrorZ.mjs';
 import { Result_UpdateFulfillHTLCDecodeErrorZ } from '../structs/Result_UpdateFulfillHTLCDecodeErrorZ.mjs';
 import { Result_UpdateAddHTLCDecodeErrorZ } from '../structs/Result_UpdateAddHTLCDecodeErrorZ.mjs';
+import { OnionMessage } from '../structs/OnionMessage.mjs';
+import { Result_OnionMessageDecodeErrorZ } from '../structs/Result_OnionMessageDecodeErrorZ.mjs';
 import { Ping } from '../structs/Ping.mjs';
 import { Result_PingDecodeErrorZ } from '../structs/Result_PingDecodeErrorZ.mjs';
 import { Pong } from '../structs/Pong.mjs';
@@ -289,6 +302,7 @@ import { Result_ErrorMessageDecodeErrorZ } from '../structs/Result_ErrorMessageD
 import { Result_WarningMessageDecodeErrorZ } from '../structs/Result_WarningMessageDecodeErrorZ.mjs';
 import { UnsignedNodeAnnouncement } from '../structs/UnsignedNodeAnnouncement.mjs';
 import { Result_UnsignedNodeAnnouncementDecodeErrorZ } from '../structs/Result_UnsignedNodeAnnouncementDecodeErrorZ.mjs';
+import { NodeAnnouncement } from '../structs/NodeAnnouncement.mjs';
 import { Result_NodeAnnouncementDecodeErrorZ } from '../structs/Result_NodeAnnouncementDecodeErrorZ.mjs';
 import { Result_QueryShortChannelIdsDecodeErrorZ } from '../structs/Result_QueryShortChannelIdsDecodeErrorZ.mjs';
 import { ReplyShortChannelIdsEnd } from '../structs/ReplyShortChannelIdsEnd.mjs';
@@ -304,12 +318,16 @@ import { Option_FilterZ } from '../structs/Option_FilterZ.mjs';
 import { LockedChannelMonitor } from '../structs/LockedChannelMonitor.mjs';
 import { Result_LockedChannelMonitorNoneZ } from '../structs/Result_LockedChannelMonitorNoneZ.mjs';
 import { MessageSendEventsProvider, MessageSendEventsProviderInterface } from '../structs/MessageSendEventsProvider.mjs';
+import { OnionMessageProvider, OnionMessageProviderInterface } from '../structs/OnionMessageProvider.mjs';
 import { EventHandler, EventHandlerInterface } from '../structs/EventHandler.mjs';
 import { EventsProvider, EventsProviderInterface } from '../structs/EventsProvider.mjs';
 import { BigSize } from '../structs/BigSize.mjs';
 import { ChannelUsage } from '../structs/ChannelUsage.mjs';
 import { Score, ScoreInterface } from '../structs/Score.mjs';
-import { MultiThreadedLockableScore } from '../structs/MultiThreadedLockableScore.mjs';
+import { LockableScore, LockableScoreInterface } from '../structs/LockableScore.mjs';
+import { WriteableScore, WriteableScoreInterface } from '../structs/WriteableScore.mjs';
+import { FutureCallback, FutureCallbackInterface } from '../structs/FutureCallback.mjs';
+import { Future } from '../structs/Future.mjs';
 import { ChannelHandshakeConfig } from '../structs/ChannelHandshakeConfig.mjs';
 import { ChannelHandshakeLimits } from '../structs/ChannelHandshakeLimits.mjs';
 import { UserConfig } from '../structs/UserConfig.mjs';
@@ -327,6 +345,7 @@ import { ChannelManagerReadArgs } from '../structs/ChannelManagerReadArgs.mjs';
 import { ExpandedKey } from '../structs/ExpandedKey.mjs';
 import { DataLossProtect } from '../structs/DataLossProtect.mjs';
 import { RoutingMessageHandler, RoutingMessageHandlerInterface } from '../structs/RoutingMessageHandler.mjs';
+import { OnionMessageHandler, OnionMessageHandlerInterface } from '../structs/OnionMessageHandler.mjs';
 import { CustomMessageReader, CustomMessageReaderInterface } from '../structs/CustomMessageReader.mjs';
 import { CustomMessageHandler, CustomMessageHandlerInterface } from '../structs/CustomMessageHandler.mjs';
 import { IgnoringMessageHandler } from '../structs/IgnoringMessageHandler.mjs';
@@ -339,8 +358,11 @@ import { ReadOnlyNetworkGraph } from '../structs/ReadOnlyNetworkGraph.mjs';
 import { P2PGossipSync } from '../structs/P2PGossipSync.mjs';
 import { DirectedChannelInfo } from '../structs/DirectedChannelInfo.mjs';
 import { EffectiveCapacity } from '../structs/EffectiveCapacity.mjs';
-import { LockableScore, LockableScoreInterface } from '../structs/LockableScore.mjs';
+import { MultiThreadedLockableScore } from '../structs/MultiThreadedLockableScore.mjs';
+import { MultiThreadedScoreLock } from '../structs/MultiThreadedScoreLock.mjs';
 import { ProbabilisticScoringParameters } from '../structs/ProbabilisticScoringParameters.mjs';
+import { OnionMessenger } from '../structs/OnionMessenger.mjs';
+import { Destination } from '../structs/Destination.mjs';
 import { RawDataPart } from '../structs/RawDataPart.mjs';
 import { Sha256 } from '../structs/Sha256.mjs';
 import { ExpiryTime } from '../structs/ExpiryTime.mjs';
@@ -366,9 +388,9 @@ export interface PersisterInterface {
        /**Persist the given [`NetworkGraph`] to disk, returning an error if persistence failed.
         */
        persist_graph(network_graph: NetworkGraph): Result_NoneErrorZ;
-       /**Persist the given [`MultiThreadedLockableScore`] to disk, returning an error if persistence failed.
+       /**Persist the given [`WriteableScore`] to disk, returning an error if persistence failed.
         */
-       persist_scorer(scorer: MultiThreadedLockableScore): Result_NoneErrorZ;
+       persist_scorer(scorer: WriteableScore): Result_NoneErrorZ;
 }
 
 class LDKPersisterHolder {
@@ -376,14 +398,17 @@ class LDKPersisterHolder {
 }
 
 /**
- * Trait that handles persisting a [`ChannelManager`], [`NetworkGraph`], and [`MultiThreadedLockableScore`] to disk.
+ * Trait that handles persisting a [`ChannelManager`], [`NetworkGraph`], and [`WriteableScore`] to disk.
  */
 export class Persister extends CommonBase {
        /* @internal */
        public bindings_instance?: bindings.LDKPersister;
 
        /* @internal */
-       constructor(_dummy: object, ptr: number) {
+       public instance_idx?: number;
+
+       /* @internal */
+       constructor(_dummy: object, ptr: bigint) {
                super(ptr, bindings.Persister_free);
                this.bindings_instance = null;
        }
@@ -392,28 +417,30 @@ export class Persister extends CommonBase {
        public static new_impl(arg: PersisterInterface): Persister {
                const impl_holder: LDKPersisterHolder = new LDKPersisterHolder();
                let structImplementation = {
-                       persist_manager (channel_manager: number): number {
+                       persist_manager (channel_manager: bigint): bigint {
                                const channel_manager_hu_conv: ChannelManager = new ChannelManager(null, channel_manager);
                                const ret: Result_NoneErrorZ = arg.persist_manager(channel_manager_hu_conv);
-                               const result: number = ret == null ? 0 : ret.clone_ptr();
+                               const result: bigint = ret == null ? 0n : ret.clone_ptr();
                                return result;
                        },
-                       persist_graph (network_graph: number): number {
+                       persist_graph (network_graph: bigint): bigint {
                                const network_graph_hu_conv: NetworkGraph = new NetworkGraph(null, network_graph);
                                const ret: Result_NoneErrorZ = arg.persist_graph(network_graph_hu_conv);
-                               const result: number = ret == null ? 0 : ret.clone_ptr();
+                               const result: bigint = ret == null ? 0n : ret.clone_ptr();
                                return result;
                        },
-                       persist_scorer (scorer: number): number {
-                               const scorer_hu_conv: MultiThreadedLockableScore = new MultiThreadedLockableScore(null, scorer);
-                               const ret: Result_NoneErrorZ = arg.persist_scorer(scorer_hu_conv);
-                               const result: number = ret == null ? 0 : ret.clone_ptr();
+                       persist_scorer (scorer: bigint): bigint {
+                               const ret_hu_conv: WriteableScore = new WriteableScore(null, scorer);
+                               CommonBase.add_ref_from(ret_hu_conv, this);
+                               const ret: Result_NoneErrorZ = arg.persist_scorer(ret_hu_conv);
+                               const result: bigint = ret == null ? 0n : ret.clone_ptr();
                                return result;
                        },
                } as bindings.LDKPersister;
-               const ptr: number = bindings.LDKPersister_new(structImplementation);
+               const ptr_idx: [bigint, number] = bindings.LDKPersister_new(structImplementation);
 
-               impl_holder.held = new Persister(null, ptr);
+               impl_holder.held = new Persister(null, ptr_idx[0]);
+               impl_holder.held.instance_idx = ptr_idx[1];
                impl_holder.held.bindings_instance = structImplementation;
                return impl_holder.held;
        }
@@ -422,7 +449,7 @@ export class Persister extends CommonBase {
         * Persist the given ['ChannelManager'] to disk, returning an error if persistence failed.
         */
        public persist_manager(channel_manager: ChannelManager): Result_NoneErrorZ {
-               const ret: number = bindings.Persister_persist_manager(this.ptr, channel_manager == null ? 0 : CommonBase.get_ptr_of(channel_manager) & ~1);
+               const ret: bigint = bindings.Persister_persist_manager(this.ptr, channel_manager == null ? 0n : CommonBase.get_ptr_of(channel_manager));
                const ret_hu_conv: Result_NoneErrorZ = Result_NoneErrorZ.constr_from_ptr(ret);
                CommonBase.add_ref_from(this, channel_manager);
                return ret_hu_conv;
@@ -432,17 +459,17 @@ export class Persister extends CommonBase {
         * Persist the given [`NetworkGraph`] to disk, returning an error if persistence failed.
         */
        public persist_graph(network_graph: NetworkGraph): Result_NoneErrorZ {
-               const ret: number = bindings.Persister_persist_graph(this.ptr, network_graph == null ? 0 : CommonBase.get_ptr_of(network_graph) & ~1);
+               const ret: bigint = bindings.Persister_persist_graph(this.ptr, network_graph == null ? 0n : CommonBase.get_ptr_of(network_graph));
                const ret_hu_conv: Result_NoneErrorZ = Result_NoneErrorZ.constr_from_ptr(ret);
                CommonBase.add_ref_from(this, network_graph);
                return ret_hu_conv;
        }
 
        /**
-        * Persist the given [`MultiThreadedLockableScore`] to disk, returning an error if persistence failed.
+        * Persist the given [`WriteableScore`] to disk, returning an error if persistence failed.
         */
-       public persist_scorer(scorer: MultiThreadedLockableScore): Result_NoneErrorZ {
-               const ret: number = bindings.Persister_persist_scorer(this.ptr, scorer == null ? 0 : CommonBase.get_ptr_of(scorer) & ~1);
+       public persist_scorer(scorer: WriteableScore): Result_NoneErrorZ {
+               const ret: bigint = bindings.Persister_persist_scorer(this.ptr, scorer == null ? 0n : CommonBase.get_ptr_of(scorer));
                const ret_hu_conv: Result_NoneErrorZ = Result_NoneErrorZ.constr_from_ptr(ret);
                CommonBase.add_ref_from(this, scorer);
                return ret_hu_conv;