Skip to content
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.

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

[trello.com/c/txGIRwKv] Update the script for adamant-wallets #647

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -109,3 +109,4 @@ runkit ex.rtf
to do.rtf
tz.rtf
profiles
CommonKit/Sources/CommonKit/AdamantSecret.swift
105 changes: 49 additions & 56 deletions Adamant.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

11 changes: 10 additions & 1 deletion Adamant.xcworkspace/xcshareddata/swiftpm/Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,15 @@
"version": "0.20220203.2"
}
},
{
"package": "AdamantWalletsAssets",
"repositoryURL": "https://github.com/Adamant-im/adamant-wallets.git",
"state": {
"branch": "trello.com/c/txGIRwKv/771-update-the-script-for-adamant-wallets",
"revision": "2084a24642998233ea4df8d7f1983324fe35f3cf",
"version": null
}
},
{
"package": "Alamofire",
"repositoryURL": "https://github.com/Alamofire/Alamofire.git",
Expand Down Expand Up @@ -345,7 +354,7 @@
},
{
"package": "Web3swift",
"repositoryURL": "https://github.com/skywinder/web3swift.git",
"repositoryURL": "https://github.com/web3swift-team/web3swift.git",
"state": {
"branch": null,
"revision": "8a026108ae5ff730ac83e9b574c8cf1c14413c94",
Expand Down

This file was deleted.

3 changes: 2 additions & 1 deletion Adamant/Modules/Wallets/Adamant/AdmWalletService.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ import MessageKit
import Combine
import CommonKit

final class AdmWalletService: NSObject, WalletCoreProtocol, @unchecked Sendable {
final class AdmWalletService: NSObject, WalletCoreProtocol, WalletStaticCoreProtocol, @unchecked Sendable {
// MARK: - Constants
let addressRegex = try! NSRegularExpression(pattern: "^U([0-9]{6,20})$")
static let currencySymbol = "ADM"

static let currencyLogo = UIImage.asset(named: "adamant_wallet") ?? .init()

Expand Down

This file was deleted.

5 changes: 3 additions & 2 deletions Adamant/Modules/Wallets/Bitcoin/BtcWalletService.swift
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,9 @@ extension String.adamant {
}
}

final class BtcWalletService: WalletCoreProtocol, @unchecked Sendable {

final class BtcWalletService: WalletCoreProtocol, WalletStaticCoreProtocol, @unchecked Sendable {
static let currencySymbol = "BTC"

var tokenSymbol: String {
type(of: self).currencySymbol
}
Expand Down

This file was deleted.

3 changes: 2 additions & 1 deletion Adamant/Modules/Wallets/Dash/DashWalletService.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ struct DashApiComand {
static let rawTransactionMethod: String = "getrawtransaction"
}

final class DashWalletService: WalletCoreProtocol, @unchecked Sendable {
final class DashWalletService: WalletCoreProtocol, WalletStaticCoreProtocol, @unchecked Sendable {
static let currencySymbol = "DASH"

var tokenSymbol: String {
return type(of: self).currencySymbol
Expand Down
Loading