Skip to content

Commit 6345e1d

Browse files
authored
Merge pull request #18 from lightningdevkit/0.0.14
0.0.14
2 parents d25e28a + 3499e7a commit 6345e1d

File tree

26 files changed

+67151
-11162
lines changed

26 files changed

+67151
-11162
lines changed

.github/workflows/swift.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
cd ..
3434
- name: Install Swift Toolchain
3535
run: |
36-
curl -L -o swift-5.4.2-RELEASE-ubuntu20.04.tar.gz https://swift.org/builds/swift-5.4.2-release/ubuntu2004/swift-5.4.2-RELEASE/swift-5.4.2-RELEASE-ubuntu20.04.tar.gz
36+
curl --verbose -L -o swift-5.4.2-RELEASE-ubuntu20.04.tar.gz https://swift.org/builds/swift-5.4.2-release/ubuntu2004/swift-5.4.2-RELEASE/swift-5.4.2-RELEASE-ubuntu20.04.tar.gz
3737
echo "Sha sum: $(sha256sum swift-5.4.2-RELEASE-ubuntu20.04.tar.gz | awk '{ print $1 }')"
3838
if [ "$(sha256sum swift-5.4.2-RELEASE-ubuntu20.04.tar.gz | awk '{ print $1 }')" != "${EXPECTED_SWIFT_SHASUM}" ]; then
3939
echo "Bad hash"

xcode/DirectBindingsApp/DirectBindingsApp.xcodeproj/project.pbxproj

Lines changed: 1890 additions & 1812 deletions
Large diffs are not rendered by default.
Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1230"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "07BBC76526D02727000D96C4"
18+
BuildableName = "DirectBindingsApp.app"
19+
BlueprintName = "DirectBindingsApp"
20+
ReferencedContainer = "container:DirectBindingsApp.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES"
30+
enableAddressSanitizer = "YES"
31+
enableASanStackUseAfterReturn = "YES">
32+
<AdditionalOptions>
33+
<AdditionalOption
34+
key = "NSZombieEnabled"
35+
value = "YES"
36+
isEnabled = "YES">
37+
</AdditionalOption>
38+
</AdditionalOptions>
39+
<Testables>
40+
<TestableReference
41+
skipped = "NO">
42+
<BuildableReference
43+
BuildableIdentifier = "primary"
44+
BlueprintIdentifier = "07BBC77626D0272D000D96C4"
45+
BuildableName = "DirectBindingsAppTests.xctest"
46+
BlueprintName = "DirectBindingsAppTests"
47+
ReferencedContainer = "container:DirectBindingsApp.xcodeproj">
48+
</BuildableReference>
49+
</TestableReference>
50+
<TestableReference
51+
skipped = "NO">
52+
<BuildableReference
53+
BuildableIdentifier = "primary"
54+
BlueprintIdentifier = "07BBC78126D0272D000D96C4"
55+
BuildableName = "DirectBindingsAppUITests.xctest"
56+
BlueprintName = "DirectBindingsAppUITests"
57+
ReferencedContainer = "container:DirectBindingsApp.xcodeproj">
58+
</BuildableReference>
59+
</TestableReference>
60+
</Testables>
61+
</TestAction>
62+
<LaunchAction
63+
buildConfiguration = "Debug"
64+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
65+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
66+
enableAddressSanitizer = "YES"
67+
enableASanStackUseAfterReturn = "YES"
68+
launchStyle = "0"
69+
useCustomWorkingDirectory = "NO"
70+
ignoresPersistentStateOnLaunch = "NO"
71+
debugDocumentVersioning = "YES"
72+
debugServiceExtension = "internal"
73+
allowLocationSimulation = "YES">
74+
<BuildableProductRunnable
75+
runnableDebuggingMode = "0">
76+
<BuildableReference
77+
BuildableIdentifier = "primary"
78+
BlueprintIdentifier = "07BBC76526D02727000D96C4"
79+
BuildableName = "DirectBindingsApp.app"
80+
BlueprintName = "DirectBindingsApp"
81+
ReferencedContainer = "container:DirectBindingsApp.xcodeproj">
82+
</BuildableReference>
83+
</BuildableProductRunnable>
84+
</LaunchAction>
85+
<ProfileAction
86+
buildConfiguration = "Release"
87+
shouldUseLaunchSchemeArgsEnv = "YES"
88+
savedToolIdentifier = ""
89+
useCustomWorkingDirectory = "NO"
90+
debugDocumentVersioning = "YES">
91+
<BuildableProductRunnable
92+
runnableDebuggingMode = "0">
93+
<BuildableReference
94+
BuildableIdentifier = "primary"
95+
BlueprintIdentifier = "07BBC76526D02727000D96C4"
96+
BuildableName = "DirectBindingsApp.app"
97+
BlueprintName = "DirectBindingsApp"
98+
ReferencedContainer = "container:DirectBindingsApp.xcodeproj">
99+
</BuildableReference>
100+
</BuildableProductRunnable>
101+
</ProfileAction>
102+
<AnalyzeAction
103+
buildConfiguration = "Debug">
104+
</AnalyzeAction>
105+
<ArchiveAction
106+
buildConfiguration = "Release"
107+
revealArchiveInOrganizer = "YES">
108+
</ArchiveAction>
109+
</Scheme>

xcode/DirectBindingsApp/DirectBindingsApp/PolarConnectionExperiment.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,10 @@ class PolarConnectionExperiment: ObservableObject {
6161
let chainTipHash = self.blockchainObserver.chainTipHash
6262
let chainTipHeight = self.blockchainObserver.chainTipHeight
6363

64-
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: nil, tx_broadcaster: self.broadcaster, logger: self.logger)
64+
let networkGraph = NetworkGraph(genesis_hash: genesis_hash)
65+
66+
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)
6568

6669
self.channelManager = self.channelManagerConstructor.channelManager
6770
self.peerManager = self.channelManagerConstructor.peerManager

0 commit comments

Comments
 (0)