Skip to content

Commit 03fc55d

Browse files
arik-soarik-so
committed
dangle() callback values passed as pointers
1 parent 12fa337 commit 03fc55d

8 files changed

+40
-38
lines changed

‎bindings/LDK/traits/BaseSign.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ open class BaseSign: NativeTypeWrapper {
2727

2828
func validate_holder_commitmentCallback(pointer: UnsafeRawPointer?, holder_txPointer: UnsafePointer<LDKHolderCommitmentTransaction>) -> LDKCResult_NoneNoneZ {
2929
let instance: BaseSign = Bindings.pointerToInstance(pointer: pointer!, sourceMarker: "BaseSign.swift::validate_holder_commitment")
30-
let holder_tx = HolderCommitmentTransaction(pointer: holder_txPointer.pointee);
30+
let holder_tx = HolderCommitmentTransaction(pointer: holder_txPointer.pointee).dangle();
3131

3232
return instance.validate_holder_commitment(holder_tx: holder_tx).cOpaqueStruct!
3333
}
@@ -40,7 +40,7 @@ open class BaseSign: NativeTypeWrapper {
4040

4141
func sign_counterparty_commitmentCallback(pointer: UnsafeRawPointer?, commitment_txPointer: UnsafePointer<LDKCommitmentTransaction>) -> LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ {
4242
let instance: BaseSign = Bindings.pointerToInstance(pointer: pointer!, sourceMarker: "BaseSign.swift::sign_counterparty_commitment")
43-
let commitment_tx = CommitmentTransaction(pointer: commitment_txPointer.pointee);
43+
let commitment_tx = CommitmentTransaction(pointer: commitment_txPointer.pointee).dangle();
4444

4545
return instance.sign_counterparty_commitment(commitment_tx: commitment_tx).cOpaqueStruct!
4646
}
@@ -58,7 +58,7 @@ open class BaseSign: NativeTypeWrapper {
5858

5959
func sign_holder_commitment_and_htlcsCallback(pointer: UnsafeRawPointer?, commitment_txPointer: UnsafePointer<LDKHolderCommitmentTransaction>) -> LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ {
6060
let instance: BaseSign = Bindings.pointerToInstance(pointer: pointer!, sourceMarker: "BaseSign.swift::sign_holder_commitment_and_htlcs")
61-
let commitment_tx = HolderCommitmentTransaction(pointer: commitment_txPointer.pointee);
61+
let commitment_tx = HolderCommitmentTransaction(pointer: commitment_txPointer.pointee).dangle();
6262

6363
return instance.sign_holder_commitment_and_htlcs(commitment_tx: commitment_tx).cOpaqueStruct!
6464
}
@@ -81,35 +81,35 @@ open class BaseSign: NativeTypeWrapper {
8181
if let per_commitment_keyUnwrapped = per_commitment_keyPointer {
8282
per_commitment_key = Bindings.tuple32_to_array(nativeType: per_commitment_keyUnwrapped.pointee)
8383
}
84-
let htlc = HTLCOutputInCommitment(pointer: htlcPointer.pointee);
84+
let htlc = HTLCOutputInCommitment(pointer: htlcPointer.pointee).dangle();
8585

8686
return instance.sign_justice_revoked_htlc(justice_tx: Bindings.LDKTransaction_to_array(nativeType: justice_tx), input: input, amount: amount, per_commitment_key: per_commitment_key, htlc: htlc).cOpaqueStruct!
8787
}
8888

8989
func sign_counterparty_htlc_transactionCallback(pointer: UnsafeRawPointer?, htlc_tx: LDKTransaction, input: uintptr_t, amount: UInt64, per_commitment_point: LDKPublicKey, htlcPointer: UnsafePointer<LDKHTLCOutputInCommitment>) -> LDKCResult_SignatureNoneZ {
9090
let instance: BaseSign = Bindings.pointerToInstance(pointer: pointer!, sourceMarker: "BaseSign.swift::sign_counterparty_htlc_transaction")
91-
let htlc = HTLCOutputInCommitment(pointer: htlcPointer.pointee);
91+
let htlc = HTLCOutputInCommitment(pointer: htlcPointer.pointee).dangle();
9292

9393
return instance.sign_counterparty_htlc_transaction(htlc_tx: Bindings.LDKTransaction_to_array(nativeType: htlc_tx), input: input, amount: amount, per_commitment_point: Bindings.tuple33_to_array(nativeType: per_commitment_point.compressed_form), htlc: htlc).cOpaqueStruct!
9494
}
9595

9696
func sign_closing_transactionCallback(pointer: UnsafeRawPointer?, closing_txPointer: UnsafePointer<LDKClosingTransaction>) -> LDKCResult_SignatureNoneZ {
9797
let instance: BaseSign = Bindings.pointerToInstance(pointer: pointer!, sourceMarker: "BaseSign.swift::sign_closing_transaction")
98-
let closing_tx = ClosingTransaction(pointer: closing_txPointer.pointee);
98+
let closing_tx = ClosingTransaction(pointer: closing_txPointer.pointee).dangle();
9999

100100
return instance.sign_closing_transaction(closing_tx: closing_tx).cOpaqueStruct!
101101
}
102102

103103
func sign_channel_announcementCallback(pointer: UnsafeRawPointer?, msgPointer: UnsafePointer<LDKUnsignedChannelAnnouncement>) -> LDKCResult_SignatureNoneZ {
104104
let instance: BaseSign = Bindings.pointerToInstance(pointer: pointer!, sourceMarker: "BaseSign.swift::sign_channel_announcement")
105-
let msg = UnsignedChannelAnnouncement(pointer: msgPointer.pointee);
105+
let msg = UnsignedChannelAnnouncement(pointer: msgPointer.pointee).dangle();
106106

107107
return instance.sign_channel_announcement(msg: msg).cOpaqueStruct!
108108
}
109109

110110
func ready_channelCallback(pointer: UnsafeMutableRawPointer?, channel_parametersPointer: UnsafePointer<LDKChannelTransactionParameters>) -> Void {
111111
let instance: BaseSign = Bindings.pointerToInstance(pointer: pointer!, sourceMarker: "BaseSign.swift::ready_channel")
112-
let channel_parameters = ChannelTransactionParameters(pointer: channel_parametersPointer.pointee);
112+
let channel_parameters = ChannelTransactionParameters(pointer: channel_parametersPointer.pointee).dangle();
113113

114114
return instance.ready_channel(channel_parameters: channel_parameters)
115115
}

‎bindings/LDK/traits/ChannelManagerPersister.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ open class ChannelManagerPersister: NativeTypeWrapper {
1515

1616
func persist_managerCallback(pointer: UnsafeRawPointer?, channel_managerPointer: UnsafePointer<LDKChannelManager>) -> LDKCResult_NoneErrorZ {
1717
let instance: ChannelManagerPersister = Bindings.pointerToInstance(pointer: pointer!, sourceMarker: "ChannelManagerPersister.swift::persist_manager")
18-
let channel_manager = ChannelManager(pointer: channel_managerPointer.pointee);
18+
let channel_manager = ChannelManager(pointer: channel_managerPointer.pointee).dangle();
1919

2020
return instance.persist_manager(channel_manager: channel_manager).cOpaqueStruct!
2121
}

‎bindings/LDK/traits/ChannelMessageHandler.swift

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,106 +15,106 @@ open class ChannelMessageHandler: NativeTypeWrapper {
1515

1616
func handle_open_channelCallback(pointer: UnsafeRawPointer?, their_node_id: LDKPublicKey, their_features: LDKInitFeatures, msgPointer: UnsafePointer<LDKOpenChannel>) -> Void {
1717
let instance: ChannelMessageHandler = Bindings.pointerToInstance(pointer: pointer!, sourceMarker: "ChannelMessageHandler.swift::handle_open_channel")
18-
let msg = OpenChannel(pointer: msgPointer.pointee);
18+
let msg = OpenChannel(pointer: msgPointer.pointee).dangle();
1919

2020
return instance.handle_open_channel(their_node_id: Bindings.tuple33_to_array(nativeType: their_node_id.compressed_form), their_features: InitFeatures(pointer: their_features), msg: msg)
2121
}
2222

2323
func handle_accept_channelCallback(pointer: UnsafeRawPointer?, their_node_id: LDKPublicKey, their_features: LDKInitFeatures, msgPointer: UnsafePointer<LDKAcceptChannel>) -> Void {
2424
let instance: ChannelMessageHandler = Bindings.pointerToInstance(pointer: pointer!, sourceMarker: "ChannelMessageHandler.swift::handle_accept_channel")
25-
let msg = AcceptChannel(pointer: msgPointer.pointee);
25+
let msg = AcceptChannel(pointer: msgPointer.pointee).dangle();
2626

2727
return instance.handle_accept_channel(their_node_id: Bindings.tuple33_to_array(nativeType: their_node_id.compressed_form), their_features: InitFeatures(pointer: their_features), msg: msg)
2828
}
2929

3030
func handle_funding_createdCallback(pointer: UnsafeRawPointer?, their_node_id: LDKPublicKey, msgPointer: UnsafePointer<LDKFundingCreated>) -> Void {
3131
let instance: ChannelMessageHandler = Bindings.pointerToInstance(pointer: pointer!, sourceMarker: "ChannelMessageHandler.swift::handle_funding_created")
32-
let msg = FundingCreated(pointer: msgPointer.pointee);
32+
let msg = FundingCreated(pointer: msgPointer.pointee).dangle();
3333

3434
return instance.handle_funding_created(their_node_id: Bindings.tuple33_to_array(nativeType: their_node_id.compressed_form), msg: msg)
3535
}
3636

3737
func handle_funding_signedCallback(pointer: UnsafeRawPointer?, their_node_id: LDKPublicKey, msgPointer: UnsafePointer<LDKFundingSigned>) -> Void {
3838
let instance: ChannelMessageHandler = Bindings.pointerToInstance(pointer: pointer!, sourceMarker: "ChannelMessageHandler.swift::handle_funding_signed")
39-
let msg = FundingSigned(pointer: msgPointer.pointee);
39+
let msg = FundingSigned(pointer: msgPointer.pointee).dangle();
4040

4141
return instance.handle_funding_signed(their_node_id: Bindings.tuple33_to_array(nativeType: their_node_id.compressed_form), msg: msg)
4242
}
4343

4444
func handle_funding_lockedCallback(pointer: UnsafeRawPointer?, their_node_id: LDKPublicKey, msgPointer: UnsafePointer<LDKFundingLocked>) -> Void {
4545
let instance: ChannelMessageHandler = Bindings.pointerToInstance(pointer: pointer!, sourceMarker: "ChannelMessageHandler.swift::handle_funding_locked")
46-
let msg = FundingLocked(pointer: msgPointer.pointee);
46+
let msg = FundingLocked(pointer: msgPointer.pointee).dangle();
4747

4848
return instance.handle_funding_locked(their_node_id: Bindings.tuple33_to_array(nativeType: their_node_id.compressed_form), msg: msg)
4949
}
5050

5151
func handle_shutdownCallback(pointer: UnsafeRawPointer?, their_node_id: LDKPublicKey, their_featuresPointer: UnsafePointer<LDKInitFeatures>, msgPointer: UnsafePointer<LDKShutdown>) -> Void {
5252
let instance: ChannelMessageHandler = Bindings.pointerToInstance(pointer: pointer!, sourceMarker: "ChannelMessageHandler.swift::handle_shutdown")
53-
let their_features = InitFeatures(pointer: their_featuresPointer.pointee);
54-
let msg = Shutdown(pointer: msgPointer.pointee);
53+
let their_features = InitFeatures(pointer: their_featuresPointer.pointee).dangle();
54+
let msg = Shutdown(pointer: msgPointer.pointee).dangle();
5555

5656
return instance.handle_shutdown(their_node_id: Bindings.tuple33_to_array(nativeType: their_node_id.compressed_form), their_features: their_features, msg: msg)
5757
}
5858

5959
func handle_closing_signedCallback(pointer: UnsafeRawPointer?, their_node_id: LDKPublicKey, msgPointer: UnsafePointer<LDKClosingSigned>) -> Void {
6060
let instance: ChannelMessageHandler = Bindings.pointerToInstance(pointer: pointer!, sourceMarker: "ChannelMessageHandler.swift::handle_closing_signed")
61-
let msg = ClosingSigned(pointer: msgPointer.pointee);
61+
let msg = ClosingSigned(pointer: msgPointer.pointee).dangle();
6262

6363
return instance.handle_closing_signed(their_node_id: Bindings.tuple33_to_array(nativeType: their_node_id.compressed_form), msg: msg)
6464
}
6565

6666
func handle_update_add_htlcCallback(pointer: UnsafeRawPointer?, their_node_id: LDKPublicKey, msgPointer: UnsafePointer<LDKUpdateAddHTLC>) -> Void {
6767
let instance: ChannelMessageHandler = Bindings.pointerToInstance(pointer: pointer!, sourceMarker: "ChannelMessageHandler.swift::handle_update_add_htlc")
68-
let msg = UpdateAddHTLC(pointer: msgPointer.pointee);
68+
let msg = UpdateAddHTLC(pointer: msgPointer.pointee).dangle();
6969

7070
return instance.handle_update_add_htlc(their_node_id: Bindings.tuple33_to_array(nativeType: their_node_id.compressed_form), msg: msg)
7171
}
7272

7373
func handle_update_fulfill_htlcCallback(pointer: UnsafeRawPointer?, their_node_id: LDKPublicKey, msgPointer: UnsafePointer<LDKUpdateFulfillHTLC>) -> Void {
7474
let instance: ChannelMessageHandler = Bindings.pointerToInstance(pointer: pointer!, sourceMarker: "ChannelMessageHandler.swift::handle_update_fulfill_htlc")
75-
let msg = UpdateFulfillHTLC(pointer: msgPointer.pointee);
75+
let msg = UpdateFulfillHTLC(pointer: msgPointer.pointee).dangle();
7676

7777
return instance.handle_update_fulfill_htlc(their_node_id: Bindings.tuple33_to_array(nativeType: their_node_id.compressed_form), msg: msg)
7878
}
7979

8080
func handle_update_fail_htlcCallback(pointer: UnsafeRawPointer?, their_node_id: LDKPublicKey, msgPointer: UnsafePointer<LDKUpdateFailHTLC>) -> Void {
8181
let instance: ChannelMessageHandler = Bindings.pointerToInstance(pointer: pointer!, sourceMarker: "ChannelMessageHandler.swift::handle_update_fail_htlc")
82-
let msg = UpdateFailHTLC(pointer: msgPointer.pointee);
82+
let msg = UpdateFailHTLC(pointer: msgPointer.pointee).dangle();
8383

8484
return instance.handle_update_fail_htlc(their_node_id: Bindings.tuple33_to_array(nativeType: their_node_id.compressed_form), msg: msg)
8585
}
8686

8787
func handle_update_fail_malformed_htlcCallback(pointer: UnsafeRawPointer?, their_node_id: LDKPublicKey, msgPointer: UnsafePointer<LDKUpdateFailMalformedHTLC>) -> Void {
8888
let instance: ChannelMessageHandler = Bindings.pointerToInstance(pointer: pointer!, sourceMarker: "ChannelMessageHandler.swift::handle_update_fail_malformed_htlc")
89-
let msg = UpdateFailMalformedHTLC(pointer: msgPointer.pointee);
89+
let msg = UpdateFailMalformedHTLC(pointer: msgPointer.pointee).dangle();
9090

9191
return instance.handle_update_fail_malformed_htlc(their_node_id: Bindings.tuple33_to_array(nativeType: their_node_id.compressed_form), msg: msg)
9292
}
9393

9494
func handle_commitment_signedCallback(pointer: UnsafeRawPointer?, their_node_id: LDKPublicKey, msgPointer: UnsafePointer<LDKCommitmentSigned>) -> Void {
9595
let instance: ChannelMessageHandler = Bindings.pointerToInstance(pointer: pointer!, sourceMarker: "ChannelMessageHandler.swift::handle_commitment_signed")
96-
let msg = CommitmentSigned(pointer: msgPointer.pointee);
96+
let msg = CommitmentSigned(pointer: msgPointer.pointee).dangle();
9797

9898
return instance.handle_commitment_signed(their_node_id: Bindings.tuple33_to_array(nativeType: their_node_id.compressed_form), msg: msg)
9999
}
100100

101101
func handle_revoke_and_ackCallback(pointer: UnsafeRawPointer?, their_node_id: LDKPublicKey, msgPointer: UnsafePointer<LDKRevokeAndACK>) -> Void {
102102
let instance: ChannelMessageHandler = Bindings.pointerToInstance(pointer: pointer!, sourceMarker: "ChannelMessageHandler.swift::handle_revoke_and_ack")
103-
let msg = RevokeAndACK(pointer: msgPointer.pointee);
103+
let msg = RevokeAndACK(pointer: msgPointer.pointee).dangle();
104104

105105
return instance.handle_revoke_and_ack(their_node_id: Bindings.tuple33_to_array(nativeType: their_node_id.compressed_form), msg: msg)
106106
}
107107

108108
func handle_update_feeCallback(pointer: UnsafeRawPointer?, their_node_id: LDKPublicKey, msgPointer: UnsafePointer<LDKUpdateFee>) -> Void {
109109
let instance: ChannelMessageHandler = Bindings.pointerToInstance(pointer: pointer!, sourceMarker: "ChannelMessageHandler.swift::handle_update_fee")
110-
let msg = UpdateFee(pointer: msgPointer.pointee);
110+
let msg = UpdateFee(pointer: msgPointer.pointee).dangle();
111111

112112
return instance.handle_update_fee(their_node_id: Bindings.tuple33_to_array(nativeType: their_node_id.compressed_form), msg: msg)
113113
}
114114

115115
func handle_announcement_signaturesCallback(pointer: UnsafeRawPointer?, their_node_id: LDKPublicKey, msgPointer: UnsafePointer<LDKAnnouncementSignatures>) -> Void {
116116
let instance: ChannelMessageHandler = Bindings.pointerToInstance(pointer: pointer!, sourceMarker: "ChannelMessageHandler.swift::handle_announcement_signatures")
117-
let msg = AnnouncementSignatures(pointer: msgPointer.pointee);
117+
let msg = AnnouncementSignatures(pointer: msgPointer.pointee).dangle();
118118

119119
return instance.handle_announcement_signatures(their_node_id: Bindings.tuple33_to_array(nativeType: their_node_id.compressed_form), msg: msg)
120120
}
@@ -127,28 +127,28 @@ let msg = Shutdown(pointer: msgPointer.pointee);
127127

128128
func peer_connectedCallback(pointer: UnsafeRawPointer?, their_node_id: LDKPublicKey, msgPointer: UnsafePointer<LDKInit>) -> Void {
129129
let instance: ChannelMessageHandler = Bindings.pointerToInstance(pointer: pointer!, sourceMarker: "ChannelMessageHandler.swift::peer_connected")
130-
let msg = Init(pointer: msgPointer.pointee);
130+
let msg = Init(pointer: msgPointer.pointee).dangle();
131131

132132
return instance.peer_connected(their_node_id: Bindings.tuple33_to_array(nativeType: their_node_id.compressed_form), msg: msg)
133133
}
134134

135135
func handle_channel_reestablishCallback(pointer: UnsafeRawPointer?, their_node_id: LDKPublicKey, msgPointer: UnsafePointer<LDKChannelReestablish>) -> Void {
136136
let instance: ChannelMessageHandler = Bindings.pointerToInstance(pointer: pointer!, sourceMarker: "ChannelMessageHandler.swift::handle_channel_reestablish")
137-
let msg = ChannelReestablish(pointer: msgPointer.pointee);
137+
let msg = ChannelReestablish(pointer: msgPointer.pointee).dangle();
138138

139139
return instance.handle_channel_reestablish(their_node_id: Bindings.tuple33_to_array(nativeType: their_node_id.compressed_form), msg: msg)
140140
}
141141

142142
func handle_channel_updateCallback(pointer: UnsafeRawPointer?, their_node_id: LDKPublicKey, msgPointer: UnsafePointer<LDKChannelUpdate>) -> Void {
143143
let instance: ChannelMessageHandler = Bindings.pointerToInstance(pointer: pointer!, sourceMarker: "ChannelMessageHandler.swift::handle_channel_update")
144-
let msg = ChannelUpdate(pointer: msgPointer.pointee);
144+
let msg = ChannelUpdate(pointer: msgPointer.pointee).dangle();
145145

146146
return instance.handle_channel_update(their_node_id: Bindings.tuple33_to_array(nativeType: their_node_id.compressed_form), msg: msg)
147147
}
148148

149149
func handle_errorCallback(pointer: UnsafeRawPointer?, their_node_id: LDKPublicKey, msgPointer: UnsafePointer<LDKErrorMessage>) -> Void {
150150
let instance: ChannelMessageHandler = Bindings.pointerToInstance(pointer: pointer!, sourceMarker: "ChannelMessageHandler.swift::handle_error")
151-
let msg = ErrorMessage(pointer: msgPointer.pointee);
151+
let msg = ErrorMessage(pointer: msgPointer.pointee).dangle();
152152

153153
return instance.handle_error(their_node_id: Bindings.tuple33_to_array(nativeType: their_node_id.compressed_form), msg: msg)
154154
}

‎bindings/LDK/traits/EventHandler.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ open class EventHandler: NativeTypeWrapper {
1515

1616
func handle_eventCallback(pointer: UnsafeRawPointer?, eventPointer: UnsafePointer<LDKEvent>) -> Void {
1717
let instance: EventHandler = Bindings.pointerToInstance(pointer: pointer!, sourceMarker: "EventHandler.swift::handle_event")
18-
let event = Event(pointer: eventPointer.pointee);
18+
let event = Event(pointer: eventPointer.pointee).dangle();
1919

2020
return instance.handle_event(event: event)
2121
}

‎bindings/LDK/traits/Persist.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ open class Persist: NativeTypeWrapper {
1515

1616
func persist_new_channelCallback(pointer: UnsafeRawPointer?, id: LDKOutPoint, dataPointer: UnsafePointer<LDKChannelMonitor>) -> LDKCResult_NoneChannelMonitorUpdateErrZ {
1717
let instance: Persist = Bindings.pointerToInstance(pointer: pointer!, sourceMarker: "Persist.swift::persist_new_channel")
18-
let data = ChannelMonitor(pointer: dataPointer.pointee);
18+
let data = ChannelMonitor(pointer: dataPointer.pointee).dangle();
1919

2020
return instance.persist_new_channel(id: OutPoint(pointer: id), data: data).cOpaqueStruct!
2121
}
2222

2323
func update_persisted_channelCallback(pointer: UnsafeRawPointer?, id: LDKOutPoint, updatePointer: UnsafePointer<LDKChannelMonitorUpdate>, dataPointer: UnsafePointer<LDKChannelMonitor>) -> LDKCResult_NoneChannelMonitorUpdateErrZ {
2424
let instance: Persist = Bindings.pointerToInstance(pointer: pointer!, sourceMarker: "Persist.swift::update_persisted_channel")
25-
let update = ChannelMonitorUpdate(pointer: updatePointer.pointee);
26-
let data = ChannelMonitor(pointer: dataPointer.pointee);
25+
let update = ChannelMonitorUpdate(pointer: updatePointer.pointee).dangle();
26+
let data = ChannelMonitor(pointer: dataPointer.pointee).dangle();
2727

2828
return instance.update_persisted_channel(id: OutPoint(pointer: id), update: update, data: data).cOpaqueStruct!
2929
}

0 commit comments

Comments
 (0)