Skip to content

Commit df58777

Browse files
arik-soarik-so
committed
update CI tests for 0.0.106
1 parent 954b521 commit df58777

File tree

22 files changed

+9722
-5857
lines changed

22 files changed

+9722
-5857
lines changed

‎ci/LDKSwift/Tests/LDKSwiftTests/HumanObjectPeerTestInstance.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ public class HumanObjectPeerTestInstance {
196196
}
197197
}
198198

199-
fileprivate class TestChannelManagerPersister: ChannelManagerPersister, ExtendedChannelManagerPersister {
199+
fileprivate class TestChannelManagerPersister: Persister, ExtendedChannelManagerPersister {
200200

201201
weak var master: Peer!
202202

‎ci/LDKSwift/Tests/LDKSwiftTests/TestChannelManagerPersister.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import LDKSwift
99
import LDKHeaders
1010

11-
class TestChannelManagerPersister : ChannelManagerPersister, ExtendedChannelManagerPersister {
11+
class TestChannelManagerPersister : Persister, ExtendedChannelManagerPersister {
1212

1313
private let channelManager: ChannelManager?
1414
private let keysManager: KeysManager? = nil

‎xcode/DirectBindingsApp/DirectBindingsApp.xcodeproj/project.pbxproj‎

Lines changed: 2046 additions & 2028 deletions
Large diffs are not rendered by default.

‎xcode/DirectBindingsApp/DirectBindingsApp/PolarConnectionExperiment.swift‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,16 @@ class PolarConnectionExperiment: ObservableObject {
6363

6464
let networkGraph = NetworkGraph(genesis_hash: genesis_hash)
6565

66+
67+
68+
6669

67-
// 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)
70+
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)
71+
let userConfig = UserConfig()
72+
let latestBlockHash = [UInt8](Data(base64Encoded: "AAAAAAAAAAAABe5Xh25D12zkQuLAJQbBeLoF1tEQqR8=")!)
73+
let latestBlockHeight = 700123
74+
75+
6876

6977
self.channelManager = self.channelManagerConstructor.channelManager
7078
self.peerManager = self.channelManagerConstructor.peerManager
@@ -93,7 +101,7 @@ class PolarConnectionExperiment: ObservableObject {
93101
return
94102
}
95103
self.hasCompletedChainSync = true
96-
self.channelManagerConstructor.chain_sync_completed(persister: self.cmPersister)
104+
self.channelManagerConstructor.chain_sync_completed(persister: self.cmPersister, scorer: nil)
97105
self.objectWillChange.send()
98106
}
99107

@@ -122,7 +130,7 @@ class PolarConnectionExperiment: ObservableObject {
122130

123131
let config = UserConfig()
124132
let theirNodeId = Block.hexStringToBytes(hexString: "034c01a4a7344e41b0a989049fb631c648c5d27f6b3fa61c7c193b40dcc96a9341")!
125-
let channelOpenResult = self.channelManager.create_channel(their_network_key: theirNodeId, channel_value_satoshis: 4000000, push_msat: 2000000, user_id: 42, override_config: config)
133+
let channelOpenResult = self.channelManager.create_channel(their_network_key: theirNodeId, channel_value_satoshis: 4000000, push_msat: 2000000, user_channel_id: 42, override_config: config)
126134

127135
self.objectWillChange.send()
128136

@@ -143,6 +151,7 @@ class PolarConnectionExperiment: ObservableObject {
143151
}
144152
self.isChannelWithAliceOpen = false
145153
self.objectWillChange.send()
154+
146155
}
147156
}
148157

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import Foundation
99

10-
class RegtestChannelManagerPersister : ChannelManagerPersister, ExtendedChannelManagerPersister {
10+
class RegtestChannelManagerPersister : Persister, ExtendedChannelManagerPersister {
1111

1212
private let channelManager: ChannelManager?
1313
private let keysManager: KeysManager? = nil

‎xcode/DirectBindingsApp/DirectBindingsAppTests/HumanObjectPeerTestInstance.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ public class HumanObjectPeerTestInstance {
195195
}
196196
}
197197

198-
fileprivate class TestChannelManagerPersister: ChannelManagerPersister, ExtendedChannelManagerPersister {
198+
fileprivate class TestChannelManagerPersister: Persister, ExtendedChannelManagerPersister {
199199

200200
weak var master: Peer!
201201

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// Created by Arik Sosman on 5/27/21.
66
//
77

8-
class TestChannelManagerPersister : ChannelManagerPersister, ExtendedChannelManagerPersister {
8+
class TestChannelManagerPersister : Persister, ExtendedChannelManagerPersister {
99

1010
private let channelManager: ChannelManager?
1111
private let keysManager: KeysManager? = nil

‎xcode/DirectBindingsApp/ldk_net.c‎

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,31 @@ static inline LDKSocketDescriptor get_descriptor(struct SocketHandler *handler,
168168
return ret;
169169
}
170170

171+
static LDKCOption_NetAddressZ get_remote_network_address(int fd) {
172+
struct sockaddr_storage sockaddr;
173+
socklen_t remote_addr_len = sizeof(sockaddr);
174+
if (getpeername(fd, (struct sockaddr*)&sockaddr, &remote_addr_len) == -1) {
175+
return COption_NetAddressZ_none();
176+
}
177+
178+
switch (sockaddr.ss_family) {
179+
case AF_INET: {
180+
const struct sockaddr_in *remote_addr = (struct sockaddr_in*)&sockaddr;
181+
LDKFourBytes addr;
182+
memcpy(&addr, &remote_addr->sin_addr.s_addr, 4);
183+
return COption_NetAddressZ_some(NetAddress_ipv4(addr, ntohs(remote_addr->sin_port)));
184+
}
185+
case AF_INET6: {
186+
const struct sockaddr_in6 *remote_addr = (struct sockaddr_in6*)&sockaddr;
187+
LDKSixteenBytes addr;
188+
memcpy(&addr, &remote_addr->sin6_addr.s6_addr, 16);
189+
return COption_NetAddressZ_some(NetAddress_ipv6(addr, ntohs(remote_addr->sin6_port)));
190+
}
191+
default:
192+
return COption_NetAddressZ_none();
193+
}
194+
}
195+
171196
static void *sock_thread_fn(void* arg) {
172197
struct SocketHandler *handler = (struct SocketHandler*) arg;
173198

@@ -214,7 +239,7 @@ static void *sock_thread_fn(void* arg) {
214239
if (newfd >= 0) {
215240
// Received a new connection, register it!
216241
LDKSocketDescriptor new_descriptor = get_descriptor(handler, newfd);
217-
LDKCResult_NonePeerHandleErrorZ con_res = PeerManager_new_inbound_connection(&handler->ldk_peer_manager, new_descriptor);
242+
LDKCResult_NonePeerHandleErrorZ con_res = PeerManager_new_inbound_connection(&handler->ldk_peer_manager, new_descriptor, get_remote_network_address(newfd));
218243
if (con_res.result_ok) {
219244
if (register_socket(handler, newfd, 0))
220245
shutdown(newfd, SHUT_RDWR);
@@ -378,7 +403,7 @@ int socket_connect(void* arg, LDKPublicKey pubkey, struct sockaddr *addr, size_t
378403
if (register_socket(handler, fd, 0)) return -4;
379404

380405
LDKSocketDescriptor descriptor = get_descriptor(handler, fd);
381-
LDKCResult_CVec_u8ZPeerHandleErrorZ con_res = PeerManager_new_outbound_connection(&handler->ldk_peer_manager, pubkey, descriptor);
406+
LDKCResult_CVec_u8ZPeerHandleErrorZ con_res = PeerManager_new_outbound_connection(&handler->ldk_peer_manager, pubkey, descriptor, get_remote_network_address(fd));
382407
if (con_res.result_ok) {
383408
ssize_t write_count = send(fd, con_res.contents.result->data, con_res.contents.result->datalen, MSG_NOSIGNAL);
384409
if (write_count != con_res.contents.result->datalen)

‎xcode/DirectBindingsApp/ldk_rust_types.h‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
#else
1111
#define NONNULL_PTR
1212
#endif
13+
struct nativeCounterpartyCommitmentSecretsOpaque;
14+
typedef struct nativeCounterpartyCommitmentSecretsOpaque LDKnativeCounterpartyCommitmentSecrets;
1315
struct nativeTxCreationKeysOpaque;
1416
typedef struct nativeTxCreationKeysOpaque LDKnativeTxCreationKeys;
1517
struct nativeChannelPublicKeysOpaque;
@@ -46,8 +48,8 @@ struct nativeRouteOpaque;
4648
typedef struct nativeRouteOpaque LDKnativeRoute;
4749
struct nativeRouteParametersOpaque;
4850
typedef struct nativeRouteParametersOpaque LDKnativeRouteParameters;
49-
struct nativePayeeOpaque;
50-
typedef struct nativePayeeOpaque LDKnativePayee;
51+
struct nativePaymentParametersOpaque;
52+
typedef struct nativePaymentParametersOpaque LDKnativePaymentParameters;
5153
struct nativeRouteHintOpaque;
5254
typedef struct nativeRouteHintOpaque LDKnativeRouteHint;
5355
struct nativeRouteHintHopOpaque;
@@ -58,10 +60,16 @@ struct nativeWatchedOutputOpaque;
5860
typedef struct nativeWatchedOutputOpaque LDKnativeWatchedOutput;
5961
struct nativeMultiThreadedLockableScoreOpaque;
6062
typedef struct nativeMultiThreadedLockableScoreOpaque LDKnativeMultiThreadedLockableScore;
63+
struct nativeFixedPenaltyScorerOpaque;
64+
typedef struct nativeFixedPenaltyScorerOpaque LDKnativeFixedPenaltyScorer;
6165
struct nativeScorerOpaque;
6266
typedef struct nativeScorerOpaque LDKnativeScorer;
6367
struct nativeScoringParametersOpaque;
6468
typedef struct nativeScoringParametersOpaque LDKnativeScoringParameters;
69+
struct nativeProbabilisticScorerOpaque;
70+
typedef struct nativeProbabilisticScorerOpaque LDKnativeProbabilisticScorer;
71+
struct nativeProbabilisticScoringParametersOpaque;
72+
typedef struct nativeProbabilisticScoringParametersOpaque LDKnativeProbabilisticScoringParameters;
6573
struct nativeInitFeaturesOpaque;
6674
typedef struct nativeInitFeaturesOpaque LDKnativeInitFeatures;
6775
struct nativeNodeFeaturesOpaque;
@@ -81,6 +89,8 @@ struct nativeInMemorySignerOpaque;
8189
typedef struct nativeInMemorySignerOpaque LDKnativeInMemorySigner;
8290
struct nativeKeysManagerOpaque;
8391
typedef struct nativeKeysManagerOpaque LDKnativeKeysManager;
92+
struct nativePhantomKeysManagerOpaque;
93+
typedef struct nativePhantomKeysManagerOpaque LDKnativePhantomKeysManager;
8494
struct nativeFilesystemPersisterOpaque;
8595
typedef struct nativeFilesystemPersisterOpaque LDKnativeFilesystemPersister;
8696
struct nativeChannelManagerOpaque;
@@ -93,6 +103,8 @@ struct nativeChannelCounterpartyOpaque;
93103
typedef struct nativeChannelCounterpartyOpaque LDKnativeChannelCounterparty;
94104
struct nativeChannelDetailsOpaque;
95105
typedef struct nativeChannelDetailsOpaque LDKnativeChannelDetails;
106+
struct nativePhantomRouteHintsOpaque;
107+
typedef struct nativePhantomRouteHintsOpaque LDKnativePhantomRouteHints;
96108
struct nativeChannelManagerReadArgsOpaque;
97109
typedef struct nativeChannelManagerReadArgsOpaque LDKnativeChannelManagerReadArgs;
98110
struct nativeChannelHandshakeConfigOpaque;
@@ -157,10 +169,12 @@ struct nativeReadOnlyNetworkGraphOpaque;
157169
typedef struct nativeReadOnlyNetworkGraphOpaque LDKnativeReadOnlyNetworkGraph;
158170
struct nativeNetGraphMsgHandlerOpaque;
159171
typedef struct nativeNetGraphMsgHandlerOpaque LDKnativeNetGraphMsgHandler;
160-
struct nativeDirectionalChannelInfoOpaque;
161-
typedef struct nativeDirectionalChannelInfoOpaque LDKnativeDirectionalChannelInfo;
172+
struct nativeChannelUpdateInfoOpaque;
173+
typedef struct nativeChannelUpdateInfoOpaque LDKnativeChannelUpdateInfo;
162174
struct nativeChannelInfoOpaque;
163175
typedef struct nativeChannelInfoOpaque LDKnativeChannelInfo;
176+
struct nativeDirectedChannelInfoOpaque;
177+
typedef struct nativeDirectedChannelInfoOpaque LDKnativeDirectedChannelInfo;
164178
struct nativeRoutingFeesOpaque;
165179
typedef struct nativeRoutingFeesOpaque LDKnativeRoutingFees;
166180
struct nativeNodeAnnouncementInfoOpaque;
@@ -173,6 +187,8 @@ struct nativeInitOpaque;
173187
typedef struct nativeInitOpaque LDKnativeInit;
174188
struct nativeErrorMessageOpaque;
175189
typedef struct nativeErrorMessageOpaque LDKnativeErrorMessage;
190+
struct nativeWarningMessageOpaque;
191+
typedef struct nativeWarningMessageOpaque LDKnativeWarningMessage;
176192
struct nativePingOpaque;
177193
typedef struct nativePingOpaque LDKnativePing;
178194
struct nativePongOpaque;

‎xcode/DirectBindingsApp/ldk_ver.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ static inline int _ldk_strncmp(const char *s1, const char *s2, uint64_t n) {
88
return 0;
99
}
1010

11-
#define _LDK_HEADER_VER "v0.0.104-7-g557c7143fddde4a3"
12-
#define _LDK_C_BINDINGS_HEADER_VER "v0.0.104.0-1-g66ae845b5d7a8e94-dirty"
11+
#define _LDK_HEADER_VER "v0.0.106-10-ga86d8b78fedd014a"
12+
#define _LDK_C_BINDINGS_HEADER_VER "v0.0.106.0"
1313
static inline const char* check_get_ldk_version() {
1414
LDKStr bin_ver = _ldk_get_compiled_version();
1515
if (_ldk_strncmp(_LDK_HEADER_VER, (const char*)bin_ver.chars, bin_ver.len) != 0) {

0 commit comments

Comments
 (0)