Skip to content

Commit 9cfcdb4

Browse files
committed
Update GDK to release_0.75.1
1 parent db6120f commit 9cfcdb4

File tree

7 files changed

+36
-98
lines changed

7 files changed

+36
-98
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
1111
- Persist wallet list across app reinstallation
1212
- Reduce login time
1313
- Improved background lightning payments
14+
- Bump GDK to 0.75.1
1415

1516
## [4.1.7] - 2025-02-21
1617

core/Models/GdkSettings.swift

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ public struct GdkSettings: Codable {
1616
case liquidTestnetElectrumSrv = "liquid_testnet_electrum_srv"
1717
case electrumTls = "electrum_tls"
1818
case gapLimit = "gap_limit"
19-
case discountFees = "discount_fees"
2019
}
2120
public let tor: Bool?
2221
public let proxy: Bool?
@@ -30,15 +29,14 @@ public struct GdkSettings: Codable {
3029
public let liquidTestnetElectrumSrv: String?
3130
public let electrumTls: Bool?
3231
public let gapLimit: Int?
33-
public let discountFees: Bool?
3432

3533
public static let btcElectrumSrvDefaultEndPoint = "blockstream.info:700"
3634
public static let liquidElectrumSrvDefaultEndPoint = "blockstream.info:995"
3735
public static let testnetElectrumSrvDefaultEndPoint = "blockstream.info:993"
3836
public static let liquidTestnetElectrumSrvDefaultEndPoint = "blockstream.info:465"
3937
public static let defaultGapLimit = 20
4038

41-
public init(tor: Bool?, proxy: Bool?, socks5Hostname: String?, socks5Port: String?, spvEnabled: Bool?, personalNodeEnabled: Bool?, btcElectrumSrv: String?, liquidElectrumSrv: String?, testnetElectrumSrv: String?, liquidTestnetElectrumSrv: String?, electrumTls: Bool?, gapLimit: Int?, discountFees: Bool?) {
39+
public init(tor: Bool?, proxy: Bool?, socks5Hostname: String?, socks5Port: String?, spvEnabled: Bool?, personalNodeEnabled: Bool?, btcElectrumSrv: String?, liquidElectrumSrv: String?, testnetElectrumSrv: String?, liquidTestnetElectrumSrv: String?, electrumTls: Bool?, gapLimit: Int?) {
4240
self.tor = tor
4341
self.proxy = proxy
4442
self.socks5Hostname = socks5Hostname
@@ -51,7 +49,6 @@ public struct GdkSettings: Codable {
5149
self.liquidTestnetElectrumSrv = liquidTestnetElectrumSrv
5250
self.electrumTls = electrumTls
5351
self.gapLimit = gapLimit
54-
self.discountFees = discountFees
5552
}
5653

5754
public static func read() -> GdkSettings? {
@@ -99,8 +96,7 @@ public struct GdkSettings: Codable {
9996
electrumUrl: gdkSettings?.personalNodeEnabled ?? false ? electrumUrl : nil,
10097
electrumOnionUrl: gdkSettings?.personalNodeEnabled ?? false ? electrumUrl : nil,
10198
electrumTls: gdkSettings?.personalNodeEnabled ?? false ? electrumTls : nil,
102-
gapLimit: gdkSettings?.gapLimit,
103-
discountFees: true // gdkSettings?.discountFees ?? false
99+
gapLimit: gdkSettings?.gapLimit
104100
)
105101
}
106102

@@ -119,8 +115,7 @@ public struct GdkSettings: Codable {
119115
testnetElectrumSrv: current?.testnetElectrumSrv,
120116
liquidTestnetElectrumSrv: current?.liquidTestnetElectrumSrv,
121117
electrumTls: current?.electrumTls,
122-
gapLimit: current?.gapLimit,
123-
discountFees: current?.discountFees
118+
gapLimit: current?.gapLimit
124119
)
125120

126121
AppSettings.shared.gdkSettings = new

gaios/OnBoard/Controllers/WalletSettingsViewController.swift

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@ class WalletSettingsViewController: KeyboardViewController {
3333
@IBOutlet weak var lblLangHint: UILabel!
3434
@IBOutlet weak var btnLang: UIButton!
3535

36-
@IBOutlet weak var cardDiscountFees: UIView!
37-
@IBOutlet weak var lblDiscountFeesTitle: UILabel!
38-
@IBOutlet weak var lblDiscountFeesHint: UILabel!
39-
@IBOutlet weak var switchDiscountFees: UISwitch!
40-
4136
@IBOutlet weak var cardProxy: UIView!
4237
@IBOutlet weak var lblProxyTitle: UILabel!
4338
@IBOutlet weak var lblProxyHint: UILabel!
@@ -107,7 +102,6 @@ class WalletSettingsViewController: KeyboardViewController {
107102
super.viewDidLoad()
108103

109104
cardExperimental.isHidden = false
110-
cardDiscountFees.isHidden = true
111105

112106
fieldProxyIp.delegate = self
113107
fieldSPVbtcServer.delegate = self
@@ -144,8 +138,6 @@ class WalletSettingsViewController: KeyboardViewController {
144138
lblExperimentalHint.text = "id_experimental_features_might".localized
145139
lblLangTitle.text = "Language".localized
146140
lblLangHint.text = "Current language".localized
147-
lblDiscountFeesTitle.text = "Discount Fees".localized
148-
lblDiscountFeesHint.text = "".localized
149141
lblProxyTitle.text = "id_connect_through_a_proxy".localized
150142
lblProxyHint.text = ""
151143
fieldProxyIp.placeholder = "id_server_ip_and_port_ipport".localized
@@ -186,8 +178,8 @@ class WalletSettingsViewController: KeyboardViewController {
186178
}
187179
lblTitle.setStyle(.title)
188180
lblHint.setStyle(.txtBigger)
189-
[lblTorTitle, lblTestnetTitle, lblAnalyticsTitle, lblExperimentalTitle, lblDiscountFeesTitle, lblProxyTitle, lblRememberHWTitle, lblSPVPersonalNodeTitle, lblMultiTitle, lblTxCheckTitle].forEach { $0?.setStyle(.txtBigger)}
190-
[lblTorHint, lblTestnetHint, lblAnalyticsHint, lblExperimentalHint, lblDiscountFeesHint, lblProxyHint, lblRememberHWHint, lblSPVPersonalNodeHint, lblMultiHint, lblTxCheckHint].forEach { $0?.setStyle(.txtCard)}
181+
[lblTorTitle, lblTestnetTitle, lblAnalyticsTitle, lblExperimentalTitle, lblProxyTitle, lblRememberHWTitle, lblSPVPersonalNodeTitle, lblMultiTitle, lblTxCheckTitle].forEach { $0?.setStyle(.txtBigger)}
182+
[lblTorHint, lblTestnetHint, lblAnalyticsHint, lblExperimentalHint, lblProxyHint, lblRememberHWHint, lblSPVPersonalNodeHint, lblMultiHint, lblTxCheckHint].forEach { $0?.setStyle(.txtCard)}
191183
btnAnalytics.setStyle(.inline)
192184
lblSPVTitle.setStyle(.subTitle)
193185
btnLang.backgroundColor = UIColor.gGreenMatrix()
@@ -212,7 +204,6 @@ class WalletSettingsViewController: KeyboardViewController {
212204
switchRememberHW.setOn(!appSettings.rememberHWIsOff, animated: true)
213205
cardExperimental.isHidden = false
214206
switchExperimental.setOn(appSettings.experimental, animated: true)
215-
switchDiscountFees.setOn(gdkSettings.discountFees ?? false, animated: true)
216207

217208
switchTestnet.setOn(appSettings.testnet, animated: true)
218209
switchTxCheck.setOn(gdkSettings.spvEnabled ?? false, animated: true)
@@ -313,8 +304,7 @@ class WalletSettingsViewController: KeyboardViewController {
313304
testnetElectrumSrv: fieldSPVtestnetServer.text,
314305
liquidTestnetElectrumSrv: fieldSPVliquidTestnetServer.text,
315306
electrumTls: switchPSPVPersonalNode.isOn && switchElectrumTls.isOn,
316-
gapLimit: gapLimit,
317-
discountFees: switchDiscountFees.isOn
307+
gapLimit: gapLimit
318308
)
319309
AppSettings.shared.testnet = switchTestnet.isOn
320310
AppSettings.shared.experimental = switchExperimental.isOn

0 commit comments

Comments
 (0)