Skip to content

feat: support all address types #431

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ben-kaufman wants to merge 20 commits into
base: master
Choose a base branch
from
+1,719 −1,279
Open

feat: support all address types #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
75dc541
feat: support all address types
ben-kaufman Feb 5, 2026
36c600e
Fix legacy type issues
ben-kaufman Feb 11, 2026
32a3ba6
Update ldk-node
ben-kaufman Feb 11, 2026
4cab166
fix balance check on disable
ben-kaufman Feb 11, 2026
82cf9ad
fix timeout issue
ben-kaufman Feb 11, 2026
13b8ab4
fix
ben-kaufman Feb 11, 2026
9ac4142
fix multiple address support for backup and migration
ben-kaufman Feb 11, 2026
bff806b
remove funds sweep for different address types
ben-kaufman Feb 11, 2026
8ca8c88
fixes
ben-kaufman Feb 11, 2026
b85158f
update ldk-node
ben-kaufman Feb 11, 2026
4181b50
update ldk-node
ben-kaufman Feb 11, 2026
6502cb3
update ldk node
ben-kaufman Feb 12, 2026
cd23f7d
fix wipe and update comments
ben-kaufman Feb 12, 2026
184d32d
fixes
ben-kaufman Feb 12, 2026
6f448f0
extract texts
ben-kaufman Feb 12, 2026
dcb9dc6
remove empty wallets from monitor list after restore
ben-kaufman Feb 12, 2026
b0e40c3
add tests
ben-kaufman Feb 12, 2026
125600e
Merge branch 'master' into feat/multiple-addresses-types
ben-kaufman Feb 16, 2026
39b5e5f
fix rebase string updates
ben-kaufman Feb 17, 2026
7ced729
Update AddressViewer.swift
ben-kaufman Feb 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/e2e_migration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ jobs:
- { name: migration_1-restore, setup_type: standard }
- { name: migration_2-migration, setup_type: standard }
- { name: migration_3-with-passphrase, setup_type: passphrase }
- { name: migration_4-with-sweep, setup_type: sweep }
with:
e2e_branch: ${{ needs.e2e-branch.outputs.branch }}
rn_version: ${{ matrix.rn_version }}
Expand All @@ -153,7 +152,6 @@ jobs:
- { name: migration_1-restore, setup_type: standard, grep: "@migration_1" }
- { name: migration_2-migration, setup_type: standard, grep: "@migration_2" }
- { name: migration_3-with-passphrase, setup_type: passphrase, grep: "@migration_3" }
- { name: migration_4-with-sweep, setup_type: sweep, grep: "@migration_4" }

name: e2e-tests - ${{ matrix.rn_version }} - ${{ matrix.scenario.name }}

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/integration-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ jobs:
-only-testing:BitkitTests/UtxoSelectionTests \
-only-testing:BitkitTests/BlocktankTests \
-only-testing:BitkitTests/PaymentFlowTests \
-only-testing:BitkitTests/AddressTypeIntegrationTests \
| xcbeautify --report junit
}
Expand Down
46 changes: 23 additions & 23 deletions Bitkit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,27 +61,6 @@
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
96EMBED0012026012000FRAME /* Remove Static Framework Stubs */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "Remove Static Framework Stubs";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# Remove static framework stubs from app bundle\\n# LDKNodeFFI is a static library - its code is linked into the main executable.\\n# The empty framework structure causes iOS install errors.\\nFRAMEWORK_PATH=\"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app/Frameworks/LDKNodeFFI.framework\"\\n\\nif [ -d \"$FRAMEWORK_PATH\" ]; then\\n echo \"Removing LDKNodeFFI static framework stub...\"\\n rm -rf \"$FRAMEWORK_PATH\"\\n echo \"Done.\"\\nfi\\n";
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXFileReference section */
961058DC2C355B5500E1F1D8 /* BitkitNotification.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = BitkitNotification.appex; sourceTree = BUILT_PRODUCTS_DIR; };
96FE1F612C2DE6AA006D0C8B /* Bitkit.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Bitkit.app; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -443,6 +422,27 @@
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
96EMBED0012026012000FRAME /* Remove Static Framework Stubs */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "Remove Static Framework Stubs";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# Remove static framework stubs from app bundle\\n# LDKNodeFFI is a static library - its code is linked into the main executable.\\n# The empty framework structure causes iOS install errors.\\nFRAMEWORK_PATH=\"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app/Frameworks/LDKNodeFFI.framework\"\\n\\nif [ -d \"$FRAMEWORK_PATH\" ]; then\\n echo \"Removing LDKNodeFFI static framework stub...\"\\n rm -rf \"$FRAMEWORK_PATH\"\\n echo \"Done.\"\\nfi\\n";
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
961058D82C355B5500E1F1D8 /* Sources */ = {
isa = PBXSourcesBuildPhase;
Expand Down Expand Up @@ -925,8 +925,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/synonymdev/ldk-node";
requirement = {
branch = main;
kind = branch;
kind = revision;
revision = 4ef1a66b5390a09ab49dcb2b1e0d32d2ca5e890f;
};
};
96DEA0382DE8BBA1009932BF /* XCRemoteSwiftPackageReference "bitkit-core" */ = {
Expand Down
3 changes: 1 addition & 2 deletions Bitkit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions Bitkit/AppScene.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,6 @@ struct AppScene: View {
if UserDefaults.standard.bool(forKey: "pinOnLaunch") && settings.pinEnabled {
isPinVerified = false
}
SweepViewModel.checkAndPromptForSweepableFunds(sheets: sheets)

if migrations.needsPostMigrationSync {
app.toast(
type: .warning,
Expand Down
16 changes: 1 addition & 15 deletions Bitkit/MainNavView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ struct MainNavView: View {
@EnvironmentObject private var wallet: WalletViewModel
@Environment(\.scenePhase) var scenePhase

@StateObject private var sweepViewModel = SweepViewModel()

@State private var showClipboardAlert = false
@State private var clipboardUri: String?

Expand Down Expand Up @@ -164,14 +162,6 @@ struct MainNavView: View {
) {
config in ForceTransferSheet(config: config)
}
.sheet(
item: $sheets.sweepPromptSheetItem,
onDismiss: {
sheets.hideSheet()
}
) {
config in SweepPromptSheet(config: config)
}
.accentColor(.white)
.overlay {
TabBar()
Expand Down Expand Up @@ -403,18 +393,14 @@ struct MainNavView: View {

// Advanced settings
case .coinSelection: CoinSelectionSettingsView()
case .addressTypePreference: AddressTypePreferenceView()
case .connections: LightningConnectionsView()
case let .connectionDetail(channelId): LightningConnectionDetailView(channelId: channelId)
case let .closeConnection(channel: channel): CloseConnectionConfirmation(channel: channel)
case .node: NodeStateView()
case .electrumSettings: ElectrumSettingsScreen()
case .rgsSettings: RgsSettingsScreen()
case .addressViewer: AddressViewer()
case .sweep: SweepSettingsView().environmentObject(sweepViewModel)
case .sweepConfirm: SweepConfirmView().environmentObject(sweepViewModel)
case .sweepFeeRate: SweepFeeRateView().environmentObject(sweepViewModel)
case .sweepFeeCustom: SweepFeeCustomView().environmentObject(sweepViewModel)
case let .sweepSuccess(txid): SweepSuccessView(txid: txid).environmentObject(sweepViewModel)

// Dev settings
case .blocktankRegtest: BlocktankRegtestView()
Expand Down
2 changes: 2 additions & 0 deletions Bitkit/Models/SettingsBackupConfig.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ enum SettingsBackupConfig {
"defaultTransactionSpeed": .string(optional: true),
"coinSelectionMethod": .string(optional: true),
"coinSelectionAlgorithm": .string(optional: true),
"selectedAddressType": .string(optional: true),
"addressTypesToMonitor": .string(optional: true),
"enableQuickpay": .bool,
"showWidgets": .bool,
"showWidgetTitles": .bool,
Expand Down
20 changes: 20 additions & 0 deletions Bitkit/Resources/Localization/en.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,6 +740,26 @@
"settings__adv__monitored_address_types" = "Monitored Address Types";
"settings__adv__monitored_address_types_update_title" = "Monitored Address Types Updated";
"settings__adv__monitored_address_types_update_description" = "Changes will take full effect after app restarts.";
"settings__adv__addr_type_timeout_title" = "Timeout";
"settings__adv__addr_type_timeout_desc" = "The operation took too long. Please try again.";
"settings__adv__addr_type_failed_title" = "Failed";
"settings__adv__addr_type_change_failed_desc" = "Could not change address type. Please try again.";
"settings__adv__addr_type_applying" = "Applying changes…";
"settings__adv__addr_type_changed_title" = "Address Type Changed";
"settings__adv__addr_type_changed_desc" = "Now using {type} addresses.";
"settings__adv__addr_type_monitored_updated_title" = "Settings Updated";
"settings__adv__addr_type_monitored_updated_desc" = "Address monitoring settings applied.";
"settings__adv__addr_type_cannot_disable_title" = "Cannot Disable";
"settings__adv__addr_type_cannot_disable_native_desc" = "At least one Native SegWit or Taproot wallet is required for Lightning channels.";
"settings__adv__addr_type_cannot_disable_balance_desc" = "{type} addresses have balance.";
"settings__adv__addr_type_monitored_failed_desc" = "Could not update monitoring settings. Please try again.";
"settings__adv__addr_type_currently_selected" = "Currently selected";
"settings__adv__addr_type_monitored_note" = "Enable monitoring to track funds received at different address types. The app will watch these addresses for incoming transactions. Disabling monitoring for a type with balance may hide your funds.";
"settings__adv__addr_type_loading_nav_address" = "Address Type";
"settings__adv__addr_type_loading_nav_monitoring" = "Address Monitoring";
"settings__adv__addr_type_loading_headline" = "Switching to <accent>{type}</accent>";
"settings__adv__addr_type_loading_updating" = "Updating Wallet";
"settings__adv__addr_type_loading_desc" = "Please wait while the wallet restarts...";
"settings__adv__gap_limit" = "Address Gap Limit";
"settings__adv__coin_selection" = "Coin Selection";
"settings__adv__cs_method" = "Coin Selection Method";
Expand Down
Loading
Loading