Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 0 additions & 7 deletions Adamant.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
A5D87BA3262CA01D00DC28F0 /* ProcedureKit in Frameworks */ = {isa = PBXBuildFile; productRef = A5D87BA2262CA01D00DC28F0 /* ProcedureKit */; };
A5DBBABD262C7221004AC028 /* Clibsodium in Frameworks */ = {isa = PBXBuildFile; productRef = A5DBBABC262C7221004AC028 /* Clibsodium */; };
A5DBBAEE262C72EF004AC028 /* BitcoinKit in Frameworks */ = {isa = PBXBuildFile; productRef = A5DBBAED262C72EF004AC028 /* BitcoinKit */; };
A5DBBAF0262C72EF004AC028 /* LiskKit in Frameworks */ = {isa = PBXBuildFile; productRef = A5DBBAEF262C72EF004AC028 /* LiskKit */; };
A5F0A04B262C9CA90009672A /* Swinject in Frameworks */ = {isa = PBXBuildFile; productRef = A5F0A04A262C9CA90009672A /* Swinject */; };
A5F92994262C855B00C3E60A /* MarkdownKit in Frameworks */ = {isa = PBXBuildFile; productRef = A5F92993262C855B00C3E60A /* MarkdownKit */; };
A5F929AF262C857D00C3E60A /* MarkdownKit in Frameworks */ = {isa = PBXBuildFile; productRef = A5F929AE262C857D00C3E60A /* MarkdownKit */; };
Expand Down Expand Up @@ -312,7 +311,6 @@
A5D87BA3262CA01D00DC28F0 /* ProcedureKit in Frameworks */,
A5C99E0E262C9E3A00F7B1B7 /* Reachability in Frameworks */,
AA8FFFCA2D4E6435001D8576 /* CryptoSwift in Frameworks */,
A5DBBAF0262C72EF004AC028 /* LiskKit in Frameworks */,
93FA403629401BFC00D20DB6 /* PopupKit in Frameworks */,
4184F1712A33044E00D7B8B9 /* FirebaseCrashlytics in Frameworks */,
A5DBBAEE262C72EF004AC028 /* BitcoinKit in Frameworks */,
Expand Down Expand Up @@ -474,7 +472,6 @@
A5785ADE262C63580001BC66 /* web3swift */,
A5DBBABC262C7221004AC028 /* Clibsodium */,
A5DBBAED262C72EF004AC028 /* BitcoinKit */,
A5DBBAEF262C72EF004AC028 /* LiskKit */,
A50AEB03262C815200B37C22 /* EFQRCode */,
A50AEB0B262C81E300B37C22 /* QRCodeReader */,
A5F92993262C855B00C3E60A /* MarkdownKit */,
Expand Down Expand Up @@ -1655,10 +1652,6 @@
isa = XCSwiftPackageProductDependency;
productName = BitcoinKit;
};
A5DBBAEF262C72EF004AC028 /* LiskKit */ = {
isa = XCSwiftPackageProductDependency;
productName = LiskKit;
};
A5F0A04A262C9CA90009672A /* Swinject */ = {
isa = XCSwiftPackageProductDependency;
package = A5F0A049262C9CA90009672A /* XCRemoteSwiftPackageReference "Swinject" */;
Expand Down
3 changes: 0 additions & 3 deletions Adamant.xcworkspace/contents.xcworkspacedata

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

35 changes: 0 additions & 35 deletions Adamant/App/DI/AppAssembly.swift
Original file line number Diff line number Diff line change
Expand Up @@ -260,38 +260,6 @@ struct AppAssembly: MainThreadAssembly {
DashLastTransactionStorage(SecureStore: r.resolve(SecureStore.self)!)
}.inObjectScope(.container)

// MARK: LskNodeApiService
container.register(KlyNodeApiService.self) { r in
KlyNodeApiService(
api: .init(
service: .init(),
nodesStorage: r.resolve(NodesStorageProtocol.self)!,
nodesAdditionalParamsStorage: r.resolve(NodesAdditionalParamsStorageProtocol.self)!,
isActive: true,
params: NodeGroup.klyNode.blockchainHealthCheckParams,
connection: r.resolve(ReachabilityMonitor.self)!.connectionPublisher
)
)
}.inObjectScope(.container)

// MARK: KlyServiceApiService
container.register(KlyServiceApiService.self) { r in
KlyServiceApiService(
api: .init(
service: .init(),
nodesStorage: r.resolve(NodesStorageProtocol.self)!,
nodesAdditionalParamsStorage: r.resolve(NodesAdditionalParamsStorageProtocol.self)!,
isActive: true,
params: NodeGroup.klyService.blockchainHealthCheckParams,
connection: r.resolve(ReachabilityMonitor.self)!.connectionPublisher
)
)
}.inObjectScope(.container)

container.register(KlyTransactionFactoryProtocol.self) { r in
KlyTransactionFactory()
}.inObjectScope(.container)

// MARK: EthApiService
container.register(EthApiService.self) { r in
r.resolve(ERC20ApiService.self)!
Expand Down Expand Up @@ -468,7 +436,6 @@ struct AppAssembly: MainThreadAssembly {
AdmWalletService(),
BtcWalletService(),
EthWalletService(),
KlyWalletService(),
DogeWalletService(),
DashWalletService()
]
Expand Down Expand Up @@ -507,8 +474,6 @@ struct AppAssembly: MainThreadAssembly {
ApiServiceCompose(
btc: $0.resolve(BtcApiService.self)!,
eth: $0.resolve(EthApiService.self)!,
klyNode: $0.resolve(KlyNodeApiService.self)!,
klyService: $0.resolve(KlyServiceApiService.self)!,
doge: $0.resolve(DogeApiService.self)!,
dash: $0.resolve(DashApiService.self)!,
adm: $0.resolve(AdamantApiServiceProtocol.self)!,
Expand Down
27 changes: 1 addition & 26 deletions Adamant/Helpers/NodeGroup+Constants.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ extension NodeGroup {
return BtcWalletService.healthCheckParameters.onScreenUpdateInterval
case .eth:
return EthWalletService.healthCheckParameters.onScreenUpdateInterval
case .klyNode:
return KlyWalletService.healthCheckParameters.onScreenUpdateInterval
case .klyService:
return KlyWalletService.healthCheckParameters.onScreenServiceUpdateInterval
case .doge:
return DogeWalletService.healthCheckParameters.onScreenUpdateInterval
case .dash:
Expand All @@ -40,10 +36,6 @@ extension NodeGroup {
return BtcWalletService.healthCheckParameters.crucialUpdateInterval
case .eth:
return EthWalletService.healthCheckParameters.crucialUpdateInterval
case .klyNode:
return KlyWalletService.healthCheckParameters.crucialUpdateInterval
case .klyService:
return KlyWalletService.healthCheckParameters.crucialServiceUpdateInterval
case .doge:
return DogeWalletService.healthCheckParameters.crucialUpdateInterval
case .dash:
Expand All @@ -63,10 +55,6 @@ extension NodeGroup {
return BtcWalletService.healthCheckParameters.threshold
case .eth:
return EthWalletService.healthCheckParameters.threshold
case .klyNode:
return KlyWalletService.healthCheckParameters.threshold
case .klyService:
return KlyWalletService.healthCheckParameters.threshold
case .doge:
return DogeWalletService.healthCheckParameters.threshold
case .dash:
Expand All @@ -86,10 +74,6 @@ extension NodeGroup {
return BtcWalletService.healthCheckParameters.normalUpdateInterval
case .eth:
return EthWalletService.healthCheckParameters.normalUpdateInterval
case .klyNode:
return KlyWalletService.healthCheckParameters.normalUpdateInterval
case .klyService:
return KlyWalletService.healthCheckParameters.normalServiceUpdateInterval
case .doge:
return DogeWalletService.healthCheckParameters.normalUpdateInterval
case .dash:
Expand All @@ -110,10 +94,6 @@ extension NodeGroup {
version = BtcWalletService.minNodeVersion
case .eth:
version = EthWalletService.minNodeVersion
case .klyNode:
version = KlyWalletService.minNodeVersion
case .klyService:
version = KlyWalletService.minNodeVersion
case .doge:
version = DogeWalletService.minNodeVersion
case .dash:
Expand All @@ -132,11 +112,6 @@ extension NodeGroup {
return BtcWalletService.tokenNetworkSymbol
case .eth:
return EthWalletService.tokenNetworkSymbol
case .klyNode:
return KlyWalletService.tokenNetworkSymbol
case .klyService:
return KlyWalletService.tokenNetworkSymbol
+ " " + .adamant.coinsNodesList.serviceNode
case .doge:
return DogeWalletService.tokenNetworkSymbol
case .dash:
Expand All @@ -152,7 +127,7 @@ extension NodeGroup {

var heightType: Node.HeightType? {
switch self {
case .btc, .eth, .klyNode, .klyService, .doge, .dash, .adm, .ipfs:
case .btc, .eth, .doge, .dash, .adm, .ipfs:
.blocks
case .infoService:
.date
Expand Down
18 changes: 0 additions & 18 deletions Adamant/Models/LskAccount.swift

This file was deleted.

1 change: 0 additions & 1 deletion Adamant/Modules/ScreensFactory/AdamantScreensFactory.swift
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ struct AdamantScreensFactory: ScreensFactory {
pkGeneratorFactory = .init(parent: assembler)

walletFactoryCompose = AdamantWalletFactoryCompose(
klyWalletFactory: .init(assembler: assembler),
dogeWalletFactory: .init(assembler: assembler),
dashWalletFactory: .init(assembler: assembler),
btcWalletFactory: .init(assembler: assembler),
Expand Down
2 changes: 0 additions & 2 deletions Adamant/Modules/Wallets/DI/AdamantWalletFactoryCompose.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ struct AdamantWalletFactoryCompose: WalletFactoryCompose {
private let factories: [any WalletFactory]

init(
klyWalletFactory: KlyWalletFactory,
dogeWalletFactory: DogeWalletFactory,
dashWalletFactory: DashWalletFactory,
btcWalletFactory: BtcWalletFactory,
Expand All @@ -21,7 +20,6 @@ struct AdamantWalletFactoryCompose: WalletFactoryCompose {
admWalletFactory: AdmWalletFactory
) {
factories = [
klyWalletFactory,
dogeWalletFactory,
dashWalletFactory,
btcWalletFactory,
Expand Down
94 changes: 0 additions & 94 deletions Adamant/Modules/Wallets/Klayr/KlyApiCore.swift

This file was deleted.

83 changes: 0 additions & 83 deletions Adamant/Modules/Wallets/Klayr/KlyNodeApiService.swift

This file was deleted.

Loading