update CI tests for 0.0.106

ci/LDKSwift/Tests/LDKSwiftTests/HumanObjectPeerTestInstance.swift

@@ -196,7 +196,7 @@ public class HumanObjectPeerTestInstance {
             }
         }
 
-        fileprivate class TestChannelManagerPersister: ChannelManagerPersister, ExtendedChannelManagerPersister {
+        fileprivate class TestChannelManagerPersister: Persister, ExtendedChannelManagerPersister {
 
             weak var master: Peer!
 

ci/LDKSwift/Tests/LDKSwiftTests/TestChannelManagerPersister.swift

@@ -8,7 +8,7 @@
 import LDKSwift
 import LDKHeaders
 
-class TestChannelManagerPersister : ChannelManagerPersister, ExtendedChannelManagerPersister {
+class TestChannelManagerPersister : Persister, ExtendedChannelManagerPersister {
 
     private let channelManager: ChannelManager?
     private let keysManager: KeysManager? = nil

xcode/DirectBindingsApp/DirectBindingsApp/PolarConnectionExperiment.swift

@@ -63,8 +63,16 @@ class PolarConnectionExperiment: ObservableObject {
 
             let networkGraph = NetworkGraph(genesis_hash: genesis_hash)
 
+
+
+
 
-//            self.channelManagerConstructor = ChannelManagerConstructor(network: lightningNetwork, config: config, current_blockchain_tip_hash: chainTipHash, current_blockchain_tip_height: chainTipHeight, keys_interface: self.keysInterface, fee_estimator: self.feeEstimator, chain_monitor: self.chainMonitor, router: networkGraph, tx_broadcaster: self.broadcaster, logger: self.logger)
+            self.channelManagerConstructor = ChannelManagerConstructor(network: lightningNetwork, config: config, current_blockchain_tip_hash: chainTipHash, current_blockchain_tip_height: chainTipHeight, keys_interface: self.keysInterface, fee_estimator: self.feeEstimator, chain_monitor: self.chainMonitor, net_graph: networkGraph, tx_broadcaster: self.broadcaster, logger: self.logger)
+            let userConfig = UserConfig()
+            let latestBlockHash = [UInt8](Data(base64Encoded: "AAAAAAAAAAAABe5Xh25D12zkQuLAJQbBeLoF1tEQqR8=")!)
+            let latestBlockHeight = 700123
+
+
 
             self.channelManager = self.channelManagerConstructor.channelManager
             self.peerManager = self.channelManagerConstructor.peerManager
@@ -93,7 +101,7 @@ class PolarConnectionExperiment: ObservableObject {
             return
         }
         self.hasCompletedChainSync = true
-        self.channelManagerConstructor.chain_sync_completed(persister: self.cmPersister)
+        self.channelManagerConstructor.chain_sync_completed(persister: self.cmPersister, scorer: nil)
         self.objectWillChange.send()
     }
 
@@ -122,7 +130,7 @@ class PolarConnectionExperiment: ObservableObject {
 
         let config = UserConfig()
         let theirNodeId = Block.hexStringToBytes(hexString: "034c01a4a7344e41b0a989049fb631c648c5d27f6b3fa61c7c193b40dcc96a9341")!
-        let channelOpenResult = self.channelManager.create_channel(their_network_key: theirNodeId, channel_value_satoshis: 4000000, push_msat: 2000000, user_id: 42, override_config: config)
+        let channelOpenResult = self.channelManager.create_channel(their_network_key: theirNodeId, channel_value_satoshis: 4000000, push_msat: 2000000, user_channel_id: 42, override_config: config)
 
         self.objectWillChange.send()
 
@@ -143,6 +151,7 @@ class PolarConnectionExperiment: ObservableObject {
             }
             self.isChannelWithAliceOpen = false
             self.objectWillChange.send()
+
         }
     }
 

xcode/DirectBindingsApp/DirectBindingsApp/app-batteries/RegtestChannelManagerPersister.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 
-class RegtestChannelManagerPersister : ChannelManagerPersister, ExtendedChannelManagerPersister {
+class RegtestChannelManagerPersister : Persister, ExtendedChannelManagerPersister {
 
     private let channelManager: ChannelManager?
     private let keysManager: KeysManager? = nil

xcode/DirectBindingsApp/DirectBindingsAppTests/HumanObjectPeerTestInstance.swift

@@ -195,7 +195,7 @@ public class HumanObjectPeerTestInstance {
             }
         }
 
-        fileprivate class TestChannelManagerPersister: ChannelManagerPersister, ExtendedChannelManagerPersister {
+        fileprivate class TestChannelManagerPersister: Persister, ExtendedChannelManagerPersister {
 
             weak var master: Peer!
 

xcode/DirectBindingsApp/DirectBindingsAppTests/test-batteries/TestChannelManagerPersister.swift

@@ -5,7 +5,7 @@
 //  Created by Arik Sosman on 5/27/21.
 //
 
-class TestChannelManagerPersister : ChannelManagerPersister, ExtendedChannelManagerPersister {
+class TestChannelManagerPersister : Persister, ExtendedChannelManagerPersister {
 
     private let channelManager: ChannelManager?
     private let keysManager: KeysManager? = nil

xcode/DirectBindingsApp/ldk_net.c

@@ -168,6 +168,31 @@ static inline LDKSocketDescriptor get_descriptor(struct SocketHandler *handler,
 	return ret;
 }
 
+static LDKCOption_NetAddressZ get_remote_network_address(int fd) {
+	struct sockaddr_storage sockaddr;
+	socklen_t remote_addr_len = sizeof(sockaddr);
+	if (getpeername(fd, (struct sockaddr*)&sockaddr, &remote_addr_len) == -1) {
+		return COption_NetAddressZ_none();
+	}
+
+	switch (sockaddr.ss_family) {
+	case AF_INET: {
+		const struct sockaddr_in *remote_addr = (struct sockaddr_in*)&sockaddr;
+		LDKFourBytes addr;
+		memcpy(&addr, &remote_addr->sin_addr.s_addr, 4);
+		return COption_NetAddressZ_some(NetAddress_ipv4(addr, ntohs(remote_addr->sin_port)));
+	}
+	case AF_INET6: {
+		const struct sockaddr_in6 *remote_addr = (struct sockaddr_in6*)&sockaddr;
+		LDKSixteenBytes addr;
+		memcpy(&addr, &remote_addr->sin6_addr.s6_addr, 16);
+		return COption_NetAddressZ_some(NetAddress_ipv6(addr, ntohs(remote_addr->sin6_port)));
+	}
+	default:
+		return COption_NetAddressZ_none();
+	}
+}
+
 static void *sock_thread_fn(void* arg) {
 	struct SocketHandler *handler = (struct SocketHandler*) arg;
 
@@ -214,7 +239,7 @@ static void *sock_thread_fn(void* arg) {
 								if (newfd >= 0) {
 									// Received a new connection, register it!
 									LDKSocketDescriptor new_descriptor = get_descriptor(handler, newfd);
-									LDKCResult_NonePeerHandleErrorZ con_res = PeerManager_new_inbound_connection(&handler->ldk_peer_manager, new_descriptor);
+									LDKCResult_NonePeerHandleErrorZ con_res = PeerManager_new_inbound_connection(&handler->ldk_peer_manager, new_descriptor, get_remote_network_address(newfd));
 									if (con_res.result_ok) {
 										if (register_socket(handler, newfd, 0))
 											shutdown(newfd, SHUT_RDWR);
@@ -378,7 +403,7 @@ int socket_connect(void* arg, LDKPublicKey pubkey, struct sockaddr *addr, size_t
 	if (register_socket(handler, fd, 0)) return -4;
 
 	LDKSocketDescriptor descriptor = get_descriptor(handler, fd);
-	LDKCResult_CVec_u8ZPeerHandleErrorZ con_res = PeerManager_new_outbound_connection(&handler->ldk_peer_manager, pubkey, descriptor);
+	LDKCResult_CVec_u8ZPeerHandleErrorZ con_res = PeerManager_new_outbound_connection(&handler->ldk_peer_manager, pubkey, descriptor, get_remote_network_address(fd));
 	if (con_res.result_ok) {
 		ssize_t write_count = send(fd, con_res.contents.result->data, con_res.contents.result->datalen, MSG_NOSIGNAL);
 		if (write_count != con_res.contents.result->datalen)

xcode/DirectBindingsApp/ldk_rust_types.h

@@ -10,6 +10,8 @@
 #else
 #define NONNULL_PTR
 #endif
+struct nativeCounterpartyCommitmentSecretsOpaque;
+typedef struct nativeCounterpartyCommitmentSecretsOpaque LDKnativeCounterpartyCommitmentSecrets;
 struct nativeTxCreationKeysOpaque;
 typedef struct nativeTxCreationKeysOpaque LDKnativeTxCreationKeys;
 struct nativeChannelPublicKeysOpaque;
@@ -46,8 +48,8 @@ struct nativeRouteOpaque;
 typedef struct nativeRouteOpaque LDKnativeRoute;
 struct nativeRouteParametersOpaque;
 typedef struct nativeRouteParametersOpaque LDKnativeRouteParameters;
-struct nativePayeeOpaque;
-typedef struct nativePayeeOpaque LDKnativePayee;
+struct nativePaymentParametersOpaque;
+typedef struct nativePaymentParametersOpaque LDKnativePaymentParameters;
 struct nativeRouteHintOpaque;
 typedef struct nativeRouteHintOpaque LDKnativeRouteHint;
 struct nativeRouteHintHopOpaque;
@@ -58,10 +60,16 @@ struct nativeWatchedOutputOpaque;
 typedef struct nativeWatchedOutputOpaque LDKnativeWatchedOutput;
 struct nativeMultiThreadedLockableScoreOpaque;
 typedef struct nativeMultiThreadedLockableScoreOpaque LDKnativeMultiThreadedLockableScore;
+struct nativeFixedPenaltyScorerOpaque;
+typedef struct nativeFixedPenaltyScorerOpaque LDKnativeFixedPenaltyScorer;
 struct nativeScorerOpaque;
 typedef struct nativeScorerOpaque LDKnativeScorer;
 struct nativeScoringParametersOpaque;
 typedef struct nativeScoringParametersOpaque LDKnativeScoringParameters;
+struct nativeProbabilisticScorerOpaque;
+typedef struct nativeProbabilisticScorerOpaque LDKnativeProbabilisticScorer;
+struct nativeProbabilisticScoringParametersOpaque;
+typedef struct nativeProbabilisticScoringParametersOpaque LDKnativeProbabilisticScoringParameters;
 struct nativeInitFeaturesOpaque;
 typedef struct nativeInitFeaturesOpaque LDKnativeInitFeatures;
 struct nativeNodeFeaturesOpaque;
@@ -81,6 +89,8 @@ struct nativeInMemorySignerOpaque;
 typedef struct nativeInMemorySignerOpaque LDKnativeInMemorySigner;
 struct nativeKeysManagerOpaque;
 typedef struct nativeKeysManagerOpaque LDKnativeKeysManager;
+struct nativePhantomKeysManagerOpaque;
+typedef struct nativePhantomKeysManagerOpaque LDKnativePhantomKeysManager;
 struct nativeFilesystemPersisterOpaque;
 typedef struct nativeFilesystemPersisterOpaque LDKnativeFilesystemPersister;
 struct nativeChannelManagerOpaque;
@@ -93,6 +103,8 @@ struct nativeChannelCounterpartyOpaque;
 typedef struct nativeChannelCounterpartyOpaque LDKnativeChannelCounterparty;
 struct nativeChannelDetailsOpaque;
 typedef struct nativeChannelDetailsOpaque LDKnativeChannelDetails;
+struct nativePhantomRouteHintsOpaque;
+typedef struct nativePhantomRouteHintsOpaque LDKnativePhantomRouteHints;
 struct nativeChannelManagerReadArgsOpaque;
 typedef struct nativeChannelManagerReadArgsOpaque LDKnativeChannelManagerReadArgs;
 struct nativeChannelHandshakeConfigOpaque;
@@ -157,10 +169,12 @@ struct nativeReadOnlyNetworkGraphOpaque;
 typedef struct nativeReadOnlyNetworkGraphOpaque LDKnativeReadOnlyNetworkGraph;
 struct nativeNetGraphMsgHandlerOpaque;
 typedef struct nativeNetGraphMsgHandlerOpaque LDKnativeNetGraphMsgHandler;
-struct nativeDirectionalChannelInfoOpaque;
-typedef struct nativeDirectionalChannelInfoOpaque LDKnativeDirectionalChannelInfo;
+struct nativeChannelUpdateInfoOpaque;
+typedef struct nativeChannelUpdateInfoOpaque LDKnativeChannelUpdateInfo;
 struct nativeChannelInfoOpaque;
 typedef struct nativeChannelInfoOpaque LDKnativeChannelInfo;
+struct nativeDirectedChannelInfoOpaque;
+typedef struct nativeDirectedChannelInfoOpaque LDKnativeDirectedChannelInfo;
 struct nativeRoutingFeesOpaque;
 typedef struct nativeRoutingFeesOpaque LDKnativeRoutingFees;
 struct nativeNodeAnnouncementInfoOpaque;
@@ -173,6 +187,8 @@ struct nativeInitOpaque;
 typedef struct nativeInitOpaque LDKnativeInit;
 struct nativeErrorMessageOpaque;
 typedef struct nativeErrorMessageOpaque LDKnativeErrorMessage;
+struct nativeWarningMessageOpaque;
+typedef struct nativeWarningMessageOpaque LDKnativeWarningMessage;
 struct nativePingOpaque;
 typedef struct nativePingOpaque LDKnativePing;
 struct nativePongOpaque;

xcode/DirectBindingsApp/ldk_ver.h

@@ -8,8 +8,8 @@ static inline int _ldk_strncmp(const char *s1, const char *s2, uint64_t n) {
 	return 0;
 }
 
-#define _LDK_HEADER_VER "v0.0.104-7-g557c7143fddde4a3"
-#define _LDK_C_BINDINGS_HEADER_VER "v0.0.104.0-1-g66ae845b5d7a8e94-dirty"
+#define _LDK_HEADER_VER "v0.0.106-10-ga86d8b78fedd014a"
+#define _LDK_C_BINDINGS_HEADER_VER "v0.0.106.0"
 static inline const char* check_get_ldk_version() {
 	LDKStr bin_ver = _ldk_get_compiled_version();
 	if (_ldk_strncmp(_LDK_HEADER_VER, (const char*)bin_ver.chars, bin_ver.len) != 0) {