Merge pull request #115 from arik-so/arik/2023/07/wrapped-with-anchor-fix

Fix wrapped trait implementations with anchor return values

Author: tnull

ci/LDKSwift/Tests/LDKSwiftTests/HumanObjectPeerTestInstance.swift

@@ -58,7 +58,7 @@ public class HumanObjectPeerTestInstance {
         let monitors: [String: ChannelMonitor]
         private(set) var filter: Filter?
         private(set) var explicitKeysManager: KeysManager!
-        private(set) var wrappedSignerProvider: SignerProvider?
+        private(set) var wrappedKeysManager: WrappedSignerProviderTests.MyKeysManager?
         private(set) var router: GossipSync!
         private(set) var channelManager: ChannelManager!
         private(set) var peerManager: PeerManager!
@@ -291,8 +291,7 @@ public class HumanObjectPeerTestInstance {
             self.explicitKeysManager = keysManager
 
             if master.configuration.useWrappedSignerProvider {
-                let keysManager = WrappedSignerProviderTests.MyKeysManager(seed: keySeed, startingTimeSecs: timestamp_seconds, startingTimeNanos: timestamp_nanos)
-                self.wrappedSignerProvider = keysManager.signerProvider;
+                self.wrappedKeysManager = WrappedSignerProviderTests.MyKeysManager(seed: keySeed, startingTimeSecs: timestamp_seconds, startingTimeNanos: timestamp_nanos)
             }
 
             if master.configuration.useRouter {
@@ -325,7 +324,7 @@ public class HumanObjectPeerTestInstance {
                 let score = probabalisticScorer.asScore()
                 let multiThreadedScorer = MultiThreadedLockableScore(score: score)
 
-                let signerProvider = master.configuration.useWrappedSignerProvider ? self.wrappedSignerProvider! : self.explicitKeysManager.asSignerProvider()
+                let signerProvider = master.configuration.useWrappedSignerProvider ? self.wrappedKeysManager!.signerProvider : self.explicitKeysManager.asSignerProvider()
                 let constructionParameters = ChannelManagerConstructionParameters(
                     config: UserConfig.initWithDefault(),
                     entropySource: self.explicitKeysManager.asEntropySource(),

ci/LDKSwift/Tests/LDKSwiftTests/WrappedSignerProviderTests.swift

@@ -83,7 +83,7 @@ class WrappedSignerProviderTests: XCTestCase {
     }
 
     class MyNodeSigner: NodeSigner {
-        var myKeysManager: MyKeysManager?
+        weak var myKeysManager: MyKeysManager?
         override func ecdh(recipient: Bindings.Recipient, otherKey: [UInt8], tweak: [UInt8]?) -> Bindings.Result_SharedSecretNoneZ {
             print("entering wrapper: ecdh()")
             return myKeysManager!.keysManager.asNodeSigner().ecdh(recipient: recipient, otherKey: otherKey, tweak: tweak)
@@ -112,15 +112,15 @@ class WrappedSignerProviderTests: XCTestCase {
     }
 
     class MyEntropySource: EntropySource {
-        var myKeysManager: MyKeysManager?
+        weak var myKeysManager: MyKeysManager?
         override func getSecureRandomBytes() -> [UInt8] {
             print("entering wrapper: getSecureRandomBytes()")
             return myKeysManager!.keysManager.asEntropySource().getSecureRandomBytes()
         }
     }
 
     class MySignerProvider: SignerProvider {
-        var myKeysManager: MyKeysManager?
+        weak var myKeysManager: MyKeysManager?
         override func deriveChannelSigner(channelValueSatoshis: UInt64, channelKeysId: [UInt8]) -> Bindings.WriteableEcdsaChannelSigner {
             print("entering wrapper: deriveChannelSigner()")
             return myKeysManager!.keysManager.asSignerProvider().deriveChannelSigner(channelValueSatoshis: channelValueSatoshis, channelKeysId: channelKeysId)
@@ -143,8 +143,13 @@ class WrappedSignerProviderTests: XCTestCase {
 
         override func getShutdownScriptpubkey() -> Bindings.ShutdownScript {
             print("entering wrapper: getShutdownScriptpubkey()")
-            let scriptPubkey = myKeysManager!.keysManager.asSignerProvider().getShutdownScriptpubkey()
-            return scriptPubkey
+            
+            let randomHex = "6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000"
+            let randomHexBytes = LDKSwiftTests.hexStringToBytes(hexString: randomHex)!
+            let witnessProgram = ShutdownScript.newWitnessProgram(version: 1, program: randomHexBytes)
+            let witnessBasedScript = witnessProgram.getValue()!
+            
+            return witnessBasedScript
         }
     }
 

out/Bindings.swift

@@ -59,6 +59,19 @@ open class NativeTypeWrapper: Hashable {
 		return false
 	}
 
+	internal func dangle(_ shouldDangle: Bool = true) -> Self {
+		self.dangling = shouldDangle
+		return self
+	}
+
+	internal func dangleRecursively() -> Self {
+		self.dangling = true
+		for currentAnchor in self.anchors {
+			currentAnchor.dangleRecursively()
+		}
+		return self
+	}
+
 	internal func noOpRetain() {
 		/* there to make sure object gets retained until after this call */
 	}

out/enums/complex/APIError.swift

@@ -436,12 +436,6 @@ extension Bindings {
 		}
 
 
-		internal func dangle(_ shouldDangle: Bool = true) -> APIError {
-			self.dangling = shouldDangle
-			return self
-		}
-
-
 		internal func danglingClone() -> APIError {
 			let dangledClone = self.clone()
 			dangledClone.dangling = true
@@ -534,12 +528,6 @@ extension Bindings {
 			}
 
 
-			internal func dangle(_ shouldDangle: Bool = true) -> APIMisuseError {
-				self.dangling = shouldDangle
-				return self
-			}
-
-
 		}
 
 
@@ -619,12 +607,6 @@ extension Bindings {
 			}
 
 
-			internal func dangle(_ shouldDangle: Bool = true) -> FeeRateTooHigh {
-				self.dangling = shouldDangle
-				return self
-			}
-
-
 		}
 
 
@@ -696,12 +678,6 @@ extension Bindings {
 			}
 
 
-			internal func dangle(_ shouldDangle: Bool = true) -> InvalidRoute {
-				self.dangling = shouldDangle
-				return self
-			}
-
-
 		}
 
 
@@ -773,12 +749,6 @@ extension Bindings {
 			}
 
 
-			internal func dangle(_ shouldDangle: Bool = true) -> ChannelUnavailable {
-				self.dangling = shouldDangle
-				return self
-			}
-
-
 		}
 
 
@@ -850,12 +820,6 @@ extension Bindings {
 			}
 
 
-			internal func dangle(_ shouldDangle: Bool = true) -> IncompatibleShutdownScript {
-				self.dangling = shouldDangle
-				return self
-			}
-
-
 		}
 
 

out/enums/complex/Balance.swift

@@ -380,12 +380,6 @@ extension Bindings {
 		}
 
 
-		internal func dangle(_ shouldDangle: Bool = true) -> Balance {
-			self.dangling = shouldDangle
-			return self
-		}
-
-
 		internal func danglingClone() -> Balance {
 			let dangledClone = self.clone()
 			dangledClone.dangling = true
@@ -477,12 +471,6 @@ extension Bindings {
 			}
 
 
-			internal func dangle(_ shouldDangle: Bool = true) -> ClaimableOnChannelClose {
-				self.dangling = shouldDangle
-				return self
-			}
-
-
 		}
 
 
@@ -562,12 +550,6 @@ extension Bindings {
 			}
 
 
-			internal func dangle(_ shouldDangle: Bool = true) -> ClaimableAwaitingConfirmations {
-				self.dangling = shouldDangle
-				return self
-			}
-
-
 		}
 
 
@@ -646,12 +628,6 @@ extension Bindings {
 			}
 
 
-			internal func dangle(_ shouldDangle: Bool = true) -> ContentiousClaimable {
-				self.dangling = shouldDangle
-				return self
-			}
-
-
 		}
 
 
@@ -731,12 +707,6 @@ extension Bindings {
 			}
 
 
-			internal func dangle(_ shouldDangle: Bool = true) -> MaybeTimeoutClaimableHTLC {
-				self.dangling = shouldDangle
-				return self
-			}
-
-
 		}
 
 
@@ -816,12 +786,6 @@ extension Bindings {
 			}
 
 
-			internal func dangle(_ shouldDangle: Bool = true) -> MaybePreimageClaimableHTLC {
-				self.dangling = shouldDangle
-				return self
-			}
-
-
 		}
 
 
@@ -894,12 +858,6 @@ extension Bindings {
 			}
 
 
-			internal func dangle(_ shouldDangle: Bool = true) -> CounterpartyRevokedOutputClaimable {
-				self.dangling = shouldDangle
-				return self
-			}
-
-
 		}
 
 

out/enums/complex/Bech32Error.swift

@@ -174,12 +174,6 @@ extension Bindings {
 		}
 
 
-		internal func dangle(_ shouldDangle: Bool = true) -> Bech32Error {
-			self.dangling = shouldDangle
-			return self
-		}
-
-
 		internal func danglingClone() -> Bech32Error {
 			let dangledClone = self.clone()
 			dangledClone.dangling = true

out/enums/complex/ClosureReason.swift

@@ -443,12 +443,6 @@ extension Bindings {
 		}
 
 
-		internal func dangle(_ shouldDangle: Bool = true) -> ClosureReason {
-			self.dangling = shouldDangle
-			return self
-		}
-
-
 		internal func danglingClone() -> ClosureReason {
 			let dangledClone = self.clone()
 			dangledClone.dangling = true
@@ -549,12 +543,6 @@ extension Bindings {
 			}
 
 
-			internal func dangle(_ shouldDangle: Bool = true) -> CounterpartyForceClosed {
-				self.dangling = shouldDangle
-				return self
-			}
-
-
 		}
 
 
@@ -627,12 +615,6 @@ extension Bindings {
 			}
 
 
-			internal func dangle(_ shouldDangle: Bool = true) -> ProcessingError {
-				self.dangling = shouldDangle
-				return self
-			}
-
-
 		}
 
 

out/enums/complex/DecodeError.swift

@@ -332,12 +332,6 @@ extension Bindings {
 		}
 
 
-		internal func dangle(_ shouldDangle: Bool = true) -> DecodeError {
-			self.dangling = shouldDangle
-			return self
-		}
-
-
 		internal func danglingClone() -> DecodeError {
 			let dangledClone = self.clone()
 			dangledClone.dangling = true

out/enums/complex/Destination.swift

@@ -193,12 +193,6 @@ extension Bindings {
 		}
 
 
-		internal func dangle(_ shouldDangle: Bool = true) -> Destination {
-			self.dangling = shouldDangle
-			return self
-		}
-
-
 		internal func danglingClone() -> Destination {
 			let dangledClone = self.clone()
 			dangledClone.dangling = true

out/enums/complex/EffectiveCapacity.swift

@@ -299,12 +299,6 @@ extension Bindings {
 		}
 
 
-		internal func dangle(_ shouldDangle: Bool = true) -> EffectiveCapacity {
-			self.dangling = shouldDangle
-			return self
-		}
-
-
 		internal func danglingClone() -> EffectiveCapacity {
 			let dangledClone = self.clone()
 			dangledClone.dangling = true
@@ -398,12 +392,6 @@ extension Bindings {
 			}
 
 
-			internal func dangle(_ shouldDangle: Bool = true) -> ExactLiquidity {
-				self.dangling = shouldDangle
-				return self
-			}
-
-
 		}
 
 
@@ -472,12 +460,6 @@ extension Bindings {
 			}
 
 
-			internal func dangle(_ shouldDangle: Bool = true) -> MaximumHTLC {
-				self.dangling = shouldDangle
-				return self
-			}
-
-
 		}
 
 
@@ -554,12 +536,6 @@ extension Bindings {
 			}
 
 
-			internal func dangle(_ shouldDangle: Bool = true) -> Total {
-				self.dangling = shouldDangle
-				return self
-			}
-
-
 		}