Skip to content

Commit 0751755

Browse files
committed
fix: tags
1 parent 96423b3 commit 0751755

File tree

4 files changed

+15
-16
lines changed

4 files changed

+15
-16
lines changed

Sources/SolanaSwift/SolanaTokenMetadata/CommonTokens.swift

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,20 @@ import Foundation
44
public extension TokenMetadata {
55
static var nativeSolana: TokenMetadata =
66
.init(
7-
_tags: [],
7+
tags: [],
88
chainId: 101,
99
mintAddress: "So11111111111111111111111111111111111111112",
1010
symbol: "SOL",
1111
name: "Solana",
1212
decimals: 9,
1313
logoURI: "https://raw.githubusercontent.com/p2p-org/solana-token-list/main/assets/mainnet/So11111111111111111111111111111111111111112/logo.png",
14-
tags: [],
1514
extensions: ["coingeckoId": .string("solana")],
1615
isNative: true
1716
)
1817

1918
static var renBTC: TokenMetadata =
2019
.init(
21-
_tags: nil,
20+
tags: nil,
2221
chainId: 101,
2322
mintAddress: PublicKey.renBTCMint.base58EncodedString,
2423
symbol: "renBTC",
@@ -34,7 +33,7 @@ public extension TokenMetadata {
3433

3534
static var usdc: TokenMetadata =
3635
.init(
37-
_tags: nil,
36+
tags: nil,
3837
chainId: 101,
3938
mintAddress: PublicKey.usdcMint.base58EncodedString,
4039
symbol: "USDC",
@@ -46,7 +45,7 @@ public extension TokenMetadata {
4645

4746
static var usdt: TokenMetadata =
4847
.init(
49-
_tags: nil,
48+
tags: nil,
5049
chainId: 101,
5150
mintAddress: PublicKey.usdtMint.base58EncodedString,
5251
symbol: "USDT",
@@ -58,7 +57,7 @@ public extension TokenMetadata {
5857

5958
static var eth: TokenMetadata =
6059
.init(
61-
_tags: nil,
60+
tags: nil,
6261
chainId: 101,
6362
mintAddress: "7vfCXTUXx5WJV5JADk17DUJ4ksgau7utNKj4b963voxs",
6463
symbol: "ETH",
@@ -70,7 +69,7 @@ public extension TokenMetadata {
7069

7170
static var usdcet: TokenMetadata =
7271
.init(
73-
_tags: nil,
72+
tags: nil,
7473
chainId: 101,
7574
mintAddress: "A9mUU4qviSctJVPJdBJWkb28deg915LYJKrzQ19ji3FM",
7675
symbol: "USDCet",

Sources/SolanaSwift/SolanaTokenMetadata/SolanaAPIClient+getAccountBalances.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ public extension SolanaAPIClient {
6464
pubkey: tokenAccount.pubkey,
6565
lamports: tokenAccount.account.data.lamports,
6666
token: .unsupported(
67+
tags: nil,
6768
mint: tokenAccount.account.data.mint.base58EncodedString,
6869
decimals: tokenMetadata?.decimals ?? 1,
6970
symbol: "",

Sources/SolanaSwift/SolanaTokenMetadata/TokenMetadata.swift

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public struct TokenMetadata: Hashable, Codable, Equatable {
2222
public let name: String
2323
public let decimals: Decimals
2424
public let logoURI: String?
25-
public var tags: [TokenTag] = []
25+
public var tags: [TokenTag]
2626
public let extensions: [String: TokenExtensionValue]?
2727
public let supply: UInt64?
2828
public private(set) var isNative = false
@@ -50,46 +50,45 @@ public struct TokenMetadata: Hashable, Codable, Equatable {
5050
}
5151

5252
public init(
53-
_tags: [String]?,
53+
tags: [String]?,
5454
chainId: Int,
5555
mintAddress: String,
5656
symbol: String,
5757
name: String,
5858
decimals: UInt8,
5959
logoURI: String?,
60-
tags: [TokenTag] = [],
6160
extensions: [String: TokenExtensionValue]?,
6261
isNative: Bool = false,
6362
supply: UInt64? = nil
6463
) {
65-
self._tags = _tags
64+
_tags = tags
6665
self.chainId = chainId
6766
self.mintAddress = mintAddress
6867
self.symbol = symbol
6968
self.name = name
7069
self.decimals = decimals
7170
self.logoURI = logoURI
72-
self.tags = tags
71+
self.tags = tags?.map { tag in TokenTag(name: tag, description: tag) } ?? []
7372
self.extensions = extensions
7473
self.isNative = isNative
7574
self.supply = supply
7675
}
7776

7877
public static func unsupported(
78+
tags: [String]?,
7979
mint: String,
8080
decimals: Decimals,
8181
symbol: String,
8282
supply: UInt64?
8383
) -> TokenMetadata {
8484
TokenMetadata(
85-
_tags: [],
85+
tags: tags,
8686
chainId: 101,
8787
mintAddress: mint,
8888
symbol: symbol,
8989
name: mint,
9090
decimals: decimals,
9191
logoURI: nil,
92-
tags: [],
9392
extensions: nil,
9493
supply: supply
9594
)

Tests/SolanaSwiftUnitTests/SolanaTokenMetadata/TokensRepositoryPerformanceTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@testable import SolanaSwift
21
import XCTest
2+
@testable import SolanaSwift
33

44
class TokensRepositoryPerformanceTests: XCTestCase {
55
func testGetPerformance() async throws {
@@ -17,7 +17,7 @@ class TokensRepositoryPerformanceTests: XCTestCase {
1717
let uuid = UUID().uuidString
1818

1919
records[uuid] = TokenMetadata(
20-
_tags: nil,
20+
tags: nil,
2121
chainId: 0,
2222
mintAddress: uuid,
2323
symbol: String(uuid.prefix(3)),

0 commit comments

Comments
 (0)