Skip to content

Commit d48550c

Browse files
arik-soarik-so
committed
revert DefaultBindingsApp behavior to rely on legacy compiled dependency binaries
1 parent 14dcb0f commit d48550c

File tree

6 files changed

+2152
-2138
lines changed

6 files changed

+2152
-2138
lines changed

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

Lines changed: 2132 additions & 2113 deletions
Large diffs are not rendered by default.

‎xcode/DirectBindingsApp/DirectBindingsApp.xcodeproj/xcuserdata/arik.xcuserdatad/xcschemes/xcschememanagement.plist

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,25 @@
44
<dict>
55
<key>SchemeUserState</key>
66
<dict>
7-
<key>DirectBindingsApp.xcscheme_^#shared#^_</key>
7+
<key>BitcoinTests.testRpcCall.xcscheme</key>
88
<dict>
99
<key>orderHint</key>
10-
<integer>0</integer>
10+
<integer>3</integer>
1111
</dict>
12-
<key>PromiseKit (Playground) 1.xcscheme</key>
12+
<key>DirectBindingsApp.xcscheme_^#shared#^_</key>
1313
<dict>
14-
<key>isShown</key>
15-
<false/>
1614
<key>orderHint</key>
17-
<integer>2</integer>
15+
<integer>0</integer>
1816
</dict>
19-
<key>PromiseKit (Playground) 2.xcscheme</key>
17+
<key>DirectBindingsAppTests.xcscheme_^#shared#^_</key>
2018
<dict>
21-
<key>isShown</key>
22-
<false/>
2319
<key>orderHint</key>
24-
<integer>3</integer>
20+
<integer>4</integer>
2521
</dict>
26-
<key>PromiseKit (Playground).xcscheme</key>
22+
<key>PolarIntegrationTest.testPolarFlow.xcscheme</key>
2723
<dict>
28-
<key>isShown</key>
29-
<false/>
3024
<key>orderHint</key>
31-
<integer>1</integer>
25+
<integer>5</integer>
3226
</dict>
3327
<key>PromiseKit (Playground) 1.xcscheme</key>
3428
<dict>

‎xcode/DirectBindingsApp/DirectBindingsApp/PolarConnectionExperiment.swift

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

64-
let networkGraph = NetworkGraph(genesis_hash: genesis_hash)
64+
let networkGraph = NetworkGraph(genesis_hash: genesis_hash, logger: self.logger)
6565

6666

6767

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class LNSyncHandler: ObservableObject {
3838
if let network = networkGraph {
3939
self.network = network
4040
} else {
41-
self.network = NetworkGraph(genesis_hash: [111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247, 79, 147, 30, 131, 101, 225, 90, 8, 156, 104, 214, 25, 0, 0, 0, 0, 0])
41+
self.network = NetworkGraph(genesis_hash: [111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247, 79, 147, 30, 131, 101, 225, 90, 8, 156, 104, 214, 25, 0, 0, 0, 0, 0], logger: Logger())
4242
}
4343
}
4444

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,18 @@ public class PolarIntegrationSample {
4242
let keysManager = KeysManager(seed: seed, starting_time_secs: timestamp_seconds, starting_time_nanos: timestamp_nanos)
4343
let keysInterface = keysManager.as_KeysInterface()
4444

45+
let logger = LDKTraitImplementations.PolarLogger()
4546
let config = UserConfig()
4647
let lightningNetwork = LDKNetwork_Regtest
4748
let genesisHash = try await rpcInterface.getBlockHash(height: 0)
4849
let reversedGenesisHash = [UInt8](genesisHash.reversed())
4950
let chaintipHash = try await rpcInterface.getChaintipHash()
5051
let reversedChaintipHash = [UInt8](chaintipHash.reversed())
5152
let chaintipHeight = try await rpcInterface.getChaintipHeight()
52-
let networkGraph = NetworkGraph(genesis_hash: reversedGenesisHash)
53+
let networkGraph = NetworkGraph(genesis_hash: reversedGenesisHash, logger: logger)
5354

5455
let scoringParams = ProbabilisticScoringParameters()
55-
let probabalisticScorer = ProbabilisticScorer(params: scoringParams, network_graph: networkGraph)
56+
let probabalisticScorer = ProbabilisticScorer(params: scoringParams, network_graph: networkGraph, logger: logger)
5657
let score = probabalisticScorer.as_Score()
5758
let multiThreadedScorer = MultiThreadedLockableScore(score: score)
5859

@@ -65,7 +66,6 @@ public class PolarIntegrationSample {
6566

6667
let feeEstimator = LDKTraitImplementations.PolarFeeEstimator()
6768
let broadcaster = LDKTraitImplementations.PolarBroadcaster(rpcInterface: rpcInterface)
68-
let logger = LDKTraitImplementations.PolarLogger()
6969
let channelMonitorPersister = LDKTraitImplementations.PolarChannelMonitorPersister()
7070
let channelManagerAndNetworkGraphPersisterAndEventHandler = LDKTraitImplementations.PolarChannelManagerAndNetworkGraphPersisterAndEventHandler()
7171
let chainMonitor = ChainMonitor(chain_source: Option_FilterZ(value: nil), broadcaster: broadcaster, logger: logger, feeest: feeEstimator, persister: channelMonitorPersister)
@@ -166,7 +166,7 @@ public class PolarIntegrationSample {
166166
}
167167
let fundingTxid = try await rpcInterface.sendMoney(destinationAddress: outputAddress, amount: channelValueBtcString)
168168
let fundingTransaction = try await rpcInterface.getTransaction(hash: fundingTxid)
169-
channelManager.funding_transaction_generated(temporary_channel_id: temporaryChannelId, funding_transaction: fundingTransaction)
169+
channelManager.funding_transaction_generated(temporary_channel_id: temporaryChannelId, counterparty_node_id: lndPubkey, funding_transaction: fundingTransaction)
170170

171171
// let's add a couple confirmations
172172
let fakeAddress = try await self.getBogusAddress(rpcInterface: rpcInterface)
@@ -434,6 +434,7 @@ public class PolarIntegrationSample {
434434
keysInterface = keysManager.as_KeysInterface()
435435

436436
config = UserConfig()
437+
let logger = LDKTraitImplementations.MuteLogger()
437438
let lightningNetwork = LDKNetwork_Bitcoin
438439
/*
439440
let genesisHash = try await rpcInterface.getBlockHash(height: 0)
@@ -446,20 +447,20 @@ public class PolarIntegrationSample {
446447
let reversedGenesisHash = PolarIntegrationSample.hexStringToBytes(hexString: reversedGenesisHashHex)!
447448
let chaintipHeight = 0
448449
let reversedChaintipHash = reversedGenesisHash
449-
let networkGraph = NetworkGraph(genesis_hash: reversedGenesisHash)
450+
let networkGraph = NetworkGraph(genesis_hash: reversedGenesisHash, logger: logger)
450451

451452
print("Genesis hash reversed: \(PolarIntegrationSample.bytesToHexString(bytes: reversedGenesisHash))")
452453

453454
let scoringParams = ProbabilisticScoringParameters()
454-
let probabalisticScorer = ProbabilisticScorer(params: scoringParams, network_graph: networkGraph)
455+
let probabalisticScorer = ProbabilisticScorer(params: scoringParams, network_graph: networkGraph, logger: logger)
455456
let score = probabalisticScorer.as_Score()
456457
let multiThreadedScorer = MultiThreadedLockableScore(score: score)
457458

458459
let feeEstimator = LDKTraitImplementations.PolarFeeEstimator()
459460
// broadcaster = LDKTraitImplementations.PolarBroadcaster(rpcInterface: rpcInterface)
460461
let broadcaster = LDKTraitImplementations.MuteBroadcaster()
461462
// logger = LDKTraitImplementations.PolarLogger()
462-
let logger = LDKTraitImplementations.MuteLogger()
463+
463464
let channelMonitorPersister = LDKTraitImplementations.PolarChannelMonitorPersister()
464465
let channelManagerAndNetworkGraphPersisterAndEventHandler = LDKTraitImplementations.PolarChannelManagerAndNetworkGraphPersisterAndEventHandler()
465466
let chainMonitor = ChainMonitor(chain_source: Option_FilterZ(value: nil), broadcaster: broadcaster, logger: logger, feeest: feeEstimator, persister: channelMonitorPersister)

‎xcode/compile_dependency_binaries_legacy.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@ export RUSTFLAGS="--cfg=c_bindings"
4747

4848
# Mac ABI binary (disable temporarily) TODO: reenable
4949
# it might be necessary to run "sudo xcode-select --switch /Library/Developer/CommandLineTools" here
50-
# sudo xcode-select --switch /Library/Developer/CommandLineTools
50+
sudo xcode-select --switch /Library/Developer/CommandLineTools
5151
rustup override set nightly
5252
cargo clean
5353
cargo build -Z build-std=panic_abort,std --features "std" --target x86_64-apple-ios-macabi --release
5454
cp "${C_BINDINGS_SOURCE_DIRECTORY}/target/x86_64-apple-ios-macabi/release/libldk.a" $FRAMEWORK_PROJECT_DIRECTORY_MAC
5555

5656
# iOS & Simulator binaries
5757
# it might be necessary to run "sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer"
58-
# sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer
58+
sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer
5959
rustup override unset
6060
cargo clean
6161
cargo lipo --features "std" --release

0 commit comments

Comments
 (0)