Skip to content

Commit 6492c96

Browse files
authored
Merge branch 'master' into feat/rn-migration
2 parents f8bc823 + 1e3cbe7 commit 6492c96

File tree

3 files changed

+20
-13
lines changed

3 files changed

+20
-13
lines changed

Bitkit.xcodeproj/project.pbxproj

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@
483483
buildSettings = {
484484
CODE_SIGN_ENTITLEMENTS = BitkitNotification/BitkitNotification.entitlements;
485485
CODE_SIGN_STYLE = Automatic;
486-
CURRENT_PROJECT_VERSION = 1;
486+
CURRENT_PROJECT_VERSION = 165;
487487
DEVELOPMENT_TEAM = KYH47R284B;
488488
GENERATE_INFOPLIST_FILE = YES;
489489
INFOPLIST_FILE = BitkitNotification/Info.plist;
@@ -495,8 +495,8 @@
495495
"@executable_path/Frameworks",
496496
"@executable_path/../../Frameworks",
497497
);
498-
MARKETING_VERSION = 1.0;
499-
PRODUCT_BUNDLE_IDENTIFIER = "to.bitkit-regtest.notification";
498+
MARKETING_VERSION = 2.0;
499+
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
500500
PRODUCT_NAME = "$(TARGET_NAME)";
501501
SDKROOT = iphoneos;
502502
SKIP_INSTALL = YES;
@@ -511,7 +511,7 @@
511511
buildSettings = {
512512
CODE_SIGN_ENTITLEMENTS = BitkitNotification/BitkitNotification.entitlements;
513513
CODE_SIGN_STYLE = Automatic;
514-
CURRENT_PROJECT_VERSION = 1;
514+
CURRENT_PROJECT_VERSION = 165;
515515
DEVELOPMENT_TEAM = KYH47R284B;
516516
GENERATE_INFOPLIST_FILE = YES;
517517
INFOPLIST_FILE = BitkitNotification/Info.plist;
@@ -523,8 +523,8 @@
523523
"@executable_path/Frameworks",
524524
"@executable_path/../../Frameworks",
525525
);
526-
MARKETING_VERSION = 1.0;
527-
PRODUCT_BUNDLE_IDENTIFIER = "to.bitkit-regtest.notification";
526+
MARKETING_VERSION = 2.0;
527+
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
528528
PRODUCT_NAME = "$(TARGET_NAME)";
529529
SDKROOT = iphoneos;
530530
SKIP_INSTALL = YES;
@@ -657,7 +657,7 @@
657657
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
658658
CODE_SIGN_ENTITLEMENTS = Bitkit/Bitkit.entitlements;
659659
CODE_SIGN_STYLE = Automatic;
660-
CURRENT_PROJECT_VERSION = 1;
660+
CURRENT_PROJECT_VERSION = 165;
661661
DEVELOPMENT_ASSET_PATHS = "\"Bitkit/Preview Content\"";
662662
DEVELOPMENT_TEAM = KYH47R284B;
663663
ENABLE_HARDENED_RUNTIME = YES;
@@ -682,8 +682,8 @@
682682
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
683683
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
684684
MACOSX_DEPLOYMENT_TARGET = 14.0;
685-
MARKETING_VERSION = 1.0;
686-
PRODUCT_BUNDLE_IDENTIFIER = "to.bitkit-regtest";
685+
MARKETING_VERSION = 2.0;
686+
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
687687
PRODUCT_NAME = "$(TARGET_NAME)";
688688
SDKROOT = auto;
689689
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
@@ -700,7 +700,7 @@
700700
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
701701
CODE_SIGN_ENTITLEMENTS = Bitkit/Bitkit.entitlements;
702702
CODE_SIGN_STYLE = Automatic;
703-
CURRENT_PROJECT_VERSION = 1;
703+
CURRENT_PROJECT_VERSION = 165;
704704
DEVELOPMENT_ASSET_PATHS = "\"Bitkit/Preview Content\"";
705705
DEVELOPMENT_TEAM = KYH47R284B;
706706
ENABLE_HARDENED_RUNTIME = YES;
@@ -725,8 +725,8 @@
725725
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
726726
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
727727
MACOSX_DEPLOYMENT_TARGET = 14.0;
728-
MARKETING_VERSION = 1.0;
729-
PRODUCT_BUNDLE_IDENTIFIER = "to.bitkit-regtest";
728+
MARKETING_VERSION = 2.0;
729+
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
730730
PRODUCT_NAME = "$(TARGET_NAME)";
731731
SDKROOT = auto;
732732
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";

Bitkit/Constants/Env.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ enum Env {
4848

4949
// MARK: wallet services
5050

51-
static let network: LDKNode.Network = (isE2E || isUnitTest) ? .regtest : .bitcoin
51+
static let network: LDKNode.Network = (isDebug || isUnitTest || isE2E) ? .regtest : .bitcoin
5252
static let ldkLogLevel = LDKNode.LogLevel.trace
5353

5454
static let walletSyncIntervalSecs: UInt64 = 10 // TODO: play around with this

README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,13 @@ This repository contains a **new native iOS app** which is **not ready for produ
1717
1. Open Bitkit.xcodeproj in XCode
1818
2. Build
1919

20+
### Network Configuration
21+
22+
The app automatically selects the network based on the build configuration:
23+
24+
- **Debug builds** → Uses **Regtest** network (for local development and testing)
25+
- **Release builds** → Uses **Bitcoin Mainnet** network (for production)
26+
2027
### Building for E2E tests
2128

2229
To produce an E2E build (uses the local Electrum backend), pass the `E2E_BUILD` compilation flag:

0 commit comments

Comments
 (0)