Skip to content

Commit 3e4c686

Browse files
authored
Merge pull request #2092 from synonymdev/set-trusted-peers
Set trusted peers list from env and Blocktank API
2 parents e157d15 + 183ee2e commit 3e4c686

File tree

5 files changed

+30
-9
lines changed

5 files changed

+30
-9
lines changed

ios/Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1028,7 +1028,7 @@ PODS:
10281028
- ReactCommon/turbomodule/bridging
10291029
- ReactCommon/turbomodule/core
10301030
- Yoga
1031-
- react-native-ldk (0.0.147):
1031+
- react-native-ldk (0.0.148):
10321032
- React
10331033
- react-native-mmkv (2.12.2):
10341034
- DoubleConversion
@@ -1806,7 +1806,7 @@ SPEC CHECKSUMS:
18061806
react-native-biometrics: 352e5a794bfffc46a0c86725ea7dc62deb085bdc
18071807
react-native-blur: a2acf22fd7bd13621df5e0b1c130b81adea7009c
18081808
react-native-image-picker: c3afe5472ef870d98a4b28415fc0b928161ee5f7
1809-
react-native-ldk: 71275a0c18172fa1646bc2a38a62560ded090da5
1809+
react-native-ldk: fda4d4381d40401bdc5c3a9965937d19b232ed08
18101810
react-native-mmkv: 8c9a677e64a1ac89b0c6cf240feea528318b3074
18111811
react-native-netinfo: bdb108d340cdb41875c9ced535977cac6d2ff321
18121812
react-native-quick-base64: a74c4b2607b9de016877a8edb776b6ac59785809

ios/bitkit.xcodeproj/project.pbxproj

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -579,6 +579,7 @@
579579
isa = XCBuildConfiguration;
580580
buildSettings = {
581581
ALWAYS_SEARCH_USER_PATHS = NO;
582+
CC = "";
582583
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
583584
CLANG_CXX_LANGUAGE_STANDARD = "c++20";
584585
CLANG_CXX_LIBRARY = "libc++";
@@ -606,6 +607,7 @@
606607
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
607608
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
608609
COPY_PHASE_STRIP = NO;
610+
CXX = "";
609611
ENABLE_STRICT_OBJC_MSGSEND = YES;
610612
ENABLE_TESTABILITY = YES;
611613
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
@@ -626,6 +628,8 @@
626628
GCC_WARN_UNUSED_FUNCTION = YES;
627629
GCC_WARN_UNUSED_VARIABLE = YES;
628630
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
631+
LD = "";
632+
LDPLUSPLUS = "";
629633
LD_RUNPATH_SEARCH_PATHS = (
630634
/usr/lib/swift,
631635
"$(inherited)",
@@ -657,6 +661,7 @@
657661
isa = XCBuildConfiguration;
658662
buildSettings = {
659663
ALWAYS_SEARCH_USER_PATHS = NO;
664+
CC = "";
660665
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
661666
CLANG_CXX_LANGUAGE_STANDARD = "c++20";
662667
CLANG_CXX_LIBRARY = "libc++";
@@ -684,6 +689,7 @@
684689
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
685690
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
686691
COPY_PHASE_STRIP = YES;
692+
CXX = "";
687693
ENABLE_NS_ASSERTIONS = NO;
688694
ENABLE_STRICT_OBJC_MSGSEND = YES;
689695
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
@@ -700,6 +706,8 @@
700706
GCC_WARN_UNUSED_FUNCTION = YES;
701707
GCC_WARN_UNUSED_VARIABLE = YES;
702708
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
709+
LD = "";
710+
LDPLUSPLUS = "";
703711
LD_RUNPATH_SEARCH_PATHS = (
704712
/usr/lib/swift,
705713
"$(inherited)",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"@synonymdev/blocktank-lsp-http-client": "1.1.2",
5050
"@synonymdev/feeds": "2.1.1",
5151
"@synonymdev/ledger": "0.0.5",
52-
"@synonymdev/react-native-ldk": "0.0.147",
52+
"@synonymdev/react-native-ldk": "0.0.148",
5353
"@synonymdev/react-native-lnurl": "0.0.10",
5454
"@synonymdev/result": "0.0.2",
5555
"@synonymdev/slashtags-keychain": "1.0.0",

src/utils/lightning/index.ts

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,6 @@ export const setupLdk = async ({
321321
},
322322
manually_accept_inbound_channels: true,
323323
},
324-
trustedZeroConfPeers: __TRUSTED_ZERO_CONF_PEERS__,
325324
rapidGossipSyncUrl,
326325
skipParamCheck: true, //Switch off for debugging LDK networking issues
327326
lspLogEvent: async (payload) => {
@@ -337,6 +336,7 @@ export const setupLdk = async ({
337336
updateLightningNodeIdThunk(),
338337
updateLightningNodeVersionThunk(),
339338
removeUnusedPeers({ selectedWallet, selectedNetwork }),
339+
addTrustedPeers(),
340340
]);
341341
if (shouldRefreshLdk) {
342342
const refreshRes = await refreshLdk({ selectedWallet, selectedNetwork });
@@ -1523,6 +1523,19 @@ export const getPeersFromStorage = ({
15231523
return getLightningStore().nodes[selectedWallet].peers[selectedNetwork];
15241524
};
15251525

1526+
/**
1527+
* Adds trusted peers from env file as well as directly from Blocktank API
1528+
*/
1529+
export const addTrustedPeers = async (): Promise<Result<string>> => {
1530+
const btInfo = await getBlocktankInfo(true);
1531+
const btNodeIds = btInfo.nodes.map((n) => n.pubkey);
1532+
1533+
await lm.setTrustedZeroConfPeerNodeIds(
1534+
Array.from(new Set([...btNodeIds, ...__TRUSTED_ZERO_CONF_PEERS__])),
1535+
);
1536+
return ok('Trusted peers added.');
1537+
};
1538+
15261539
/**
15271540
* Removes unused peers by comparing saved peers to the channel list to prevent unnecessarily connecting to them on subsequent startups.
15281541
* Will ensure Blocktank's node is not removed if previously added.

yarn.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4663,16 +4663,16 @@ __metadata:
46634663
languageName: node
46644664
linkType: hard
46654665

4666-
"@synonymdev/react-native-ldk@npm:0.0.147":
4667-
version: 0.0.147
4668-
resolution: "@synonymdev/react-native-ldk@npm:0.0.147"
4666+
"@synonymdev/react-native-ldk@npm:0.0.148":
4667+
version: 0.0.148
4668+
resolution: "@synonymdev/react-native-ldk@npm:0.0.148"
46694669
dependencies:
46704670
"@synonymdev/raw-transaction-decoder": 1.1.0
46714671
bech32: ^2.0.0
46724672
bitcoinjs-lib: ^6.0.2
46734673
peerDependencies:
46744674
react-native: "*"
4675-
checksum: fa999832a99c56cda62dd46a2e9c3d4b2ab53725cfd6a4474beff318090b27dcbb11e3276a945416f95ce7efc4d78aac781c65ef53d5c18be8f75a90e40fe9fb
4675+
checksum: 79f990e6b2e63bcf18680c4ec9583a91e5571cb1c71c408363e0e6be8248cb12a49e097f7106cce5832c465e347d5e8385d7ef8a5be7dfd9d13eb8cc62e3f05a
46764676
languageName: node
46774677
linkType: hard
46784678

@@ -6314,7 +6314,7 @@ __metadata:
63146314
"@synonymdev/blocktank-lsp-http-client": 1.1.2
63156315
"@synonymdev/feeds": 2.1.1
63166316
"@synonymdev/ledger": 0.0.5
6317-
"@synonymdev/react-native-ldk": 0.0.147
6317+
"@synonymdev/react-native-ldk": 0.0.148
63186318
"@synonymdev/react-native-lnurl": 0.0.10
63196319
"@synonymdev/result": 0.0.2
63206320
"@synonymdev/slashtags-keychain": 1.0.0

0 commit comments

Comments
 (0)