Fix findRoute segfault.

lightningdevkit · Sep 13, 2023 · eed8878 · eed8878
1 parent 4323dca
commit eed8878
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 3 deletions.
diff --git a/ci/LDKSwift/Tests/LDKSwiftTests/HumanObjectPeerTestInstance.swift b/ci/LDKSwift/Tests/LDKSwiftTests/HumanObjectPeerTestInstance.swift
@@ -676,6 +676,39 @@ public class HumanObjectPeerTestInstance {
 
             let recreatedInvoice = Bolt11Invoice.fromStr(s: invoice.toStr())
             XCTAssertTrue(recreatedInvoice.isOk())
+
+            // find route
+
+            do {
+                let payerPubkey = peer1.channelManager.getOurNodeId()
+                let payeePubkey = peer2.channelManager.getOurNodeId()
+                let paymentParameters = PaymentParameters.initForKeysend(payeePubkey: payeePubkey, finalCltvExpiryDelta: 3, allowMpp: false)
+
+                let amount = invoice.amountMilliSatoshis()!
+                let routeParameters = RouteParameters(paymentParamsArg: paymentParameters, finalValueMsatArg: amount)
+                let randomSeedBytes: [UInt8] = [UInt8](repeating: 0, count: 32)
+                let scoringParams = ProbabilisticScoringDecayParameters.initWithDefault()
+                let networkGraph = peer1.constructor!.netGraph!
+                let scorer = ProbabilisticScorer(decayParams: scoringParams, networkGraph: networkGraph, logger: logger)
+                let score = scorer.asScore()
+
+                let scoreParams = ProbabilisticScoringFeeParameters.initWithDefault()
+
+                let foundRoute = Bindings.findRoute(
+                    ourNodePubkey: payerPubkey,
+                    routeParams: routeParameters,
+                    networkGraph: networkGraph,
+                    firstHops: usableChannelsA,
+                    logger: logger,
+                    scorer: score,
+                    scoreParams: scoreParams,
+                    randomSeedBytes: randomSeedBytes
+                )
+
+                let route = foundRoute.getValue()!
+                let fees = route.getTotalFees()
+                print("found route fees: \(fees)")
+            }
 
             let channelManagerConstructor = peer1.constructor!
             let invoicePaymentResult = Bindings.payInvoice(invoice: invoice, retryStrategy: Bindings.Retry.initWithAttempts(a: 3), channelmanager: channelManagerConstructor.channelManager)

diff --git a/out/Bindings.swift b/out/Bindings.swift
@@ -1236,7 +1236,9 @@ public class Bindings {
 		if let firstHops = firstHops {
 
 			let firstHopsVector = Vec_ChannelDetailsZ(
-				array: firstHops, instantiationContext: "Bindings.swift::\(#function):\(#line)")
+				array: firstHops, instantiationContext: "Bindings.swift::\(#function):\(#line)"
+			)
+			.dangle()
 
 			firstHopsVectorPointer = UnsafeMutablePointer<LDKCVec_ChannelDetailsZ>.allocate(capacity: 1)
 			firstHopsVectorPointer!.initialize(to: firstHopsVector.cType!)

diff --git a/out/traits/Router.swift b/out/traits/Router.swift
@@ -269,7 +269,9 @@ extension Bindings {
 			if let firstHops = firstHops {
 
 				let firstHopsVector = Vec_ChannelDetailsZ(
-					array: firstHops, instantiationContext: "Router.swift::\(#function):\(#line)")
+					array: firstHops, instantiationContext: "Router.swift::\(#function):\(#line)"
+				)
+				.dangle()
 
 				firstHopsVectorPointer = UnsafeMutablePointer<LDKCVec_ChannelDetailsZ>.allocate(capacity: 1)
 				firstHopsVectorPointer!.initialize(to: firstHopsVector.cType!)
@@ -323,7 +325,9 @@ extension Bindings {
 			if let firstHops = firstHops {
 
 				let firstHopsVector = Vec_ChannelDetailsZ(
-					array: firstHops, instantiationContext: "Router.swift::\(#function):\(#line)")
+					array: firstHops, instantiationContext: "Router.swift::\(#function):\(#line)"
+				)
+				.dangle()
 
 				firstHopsVectorPointer = UnsafeMutablePointer<LDKCVec_ChannelDetailsZ>.allocate(capacity: 1)
 				firstHopsVectorPointer!.initialize(to: firstHopsVector.cType!)

diff --git a/src/generation/base_type_generator.mts b/src/generation/base_type_generator.mts
@@ -735,6 +735,8 @@ export abstract class BaseTypeGenerator<Type extends RustType> {
 					// memoryManagementInfix = ''
 					// }
 				}
+			} else if (argument.isAsteriskPointer && this.isPointerArgumentNullable(argument, containerType)) {
+				memoryManagementInfix = '.dangle()';
 			}
 		} else if (argument.type instanceof RustPrimitiveWrapper && argument.type.isDeallocatable()) {
 			// memoryManagementInfix = '.dangle()';