fix: tags

p2p-org · Jan 3, 2024 · 0751755 · 0751755
1 parent 96423b3
commit 0751755
Showing 4 changed files with 15 additions and 16 deletions.
diff --git a/Sources/SolanaSwift/SolanaTokenMetadata/CommonTokens.swift b/Sources/SolanaSwift/SolanaTokenMetadata/CommonTokens.swift
@@ -4,21 +4,20 @@ import Foundation
 public extension TokenMetadata {
     static var nativeSolana: TokenMetadata =
         .init(
-            _tags: [],
+            tags: [],
             chainId: 101,
             mintAddress: "So11111111111111111111111111111111111111112",
             symbol: "SOL",
             name: "Solana",
             decimals: 9,
             logoURI: "https://raw.githubusercontent.com/p2p-org/solana-token-list/main/assets/mainnet/So11111111111111111111111111111111111111112/logo.png",
-            tags: [],
             extensions: ["coingeckoId": .string("solana")],
             isNative: true
         )
 
     static var renBTC: TokenMetadata =
         .init(
-            _tags: nil,
+            tags: nil,
             chainId: 101,
             mintAddress: PublicKey.renBTCMint.base58EncodedString,
             symbol: "renBTC",
@@ -34,7 +33,7 @@ public extension TokenMetadata {
 
     static var usdc: TokenMetadata =
         .init(
-            _tags: nil,
+            tags: nil,
             chainId: 101,
             mintAddress: PublicKey.usdcMint.base58EncodedString,
             symbol: "USDC",
@@ -46,7 +45,7 @@ public extension TokenMetadata {
 
     static var usdt: TokenMetadata =
         .init(
-            _tags: nil,
+            tags: nil,
             chainId: 101,
             mintAddress: PublicKey.usdtMint.base58EncodedString,
             symbol: "USDT",
@@ -58,7 +57,7 @@ public extension TokenMetadata {
 
     static var eth: TokenMetadata =
         .init(
-            _tags: nil,
+            tags: nil,
             chainId: 101,
             mintAddress: "7vfCXTUXx5WJV5JADk17DUJ4ksgau7utNKj4b963voxs",
             symbol: "ETH",
@@ -70,7 +69,7 @@ public extension TokenMetadata {
 
     static var usdcet: TokenMetadata =
         .init(
-            _tags: nil,
+            tags: nil,
             chainId: 101,
             mintAddress: "A9mUU4qviSctJVPJdBJWkb28deg915LYJKrzQ19ji3FM",
             symbol: "USDCet",

diff --git a/Sources/SolanaSwift/SolanaTokenMetadata/SolanaAPIClient+getAccountBalances.swift b/Sources/SolanaSwift/SolanaTokenMetadata/SolanaAPIClient+getAccountBalances.swift
@@ -64,6 +64,7 @@ public extension SolanaAPIClient {
                     pubkey: tokenAccount.pubkey,
                     lamports: tokenAccount.account.data.lamports,
                     token: .unsupported(
+                        tags: nil,
                         mint: tokenAccount.account.data.mint.base58EncodedString,
                         decimals: tokenMetadata?.decimals ?? 1,
                         symbol: "",

diff --git a/Sources/SolanaSwift/SolanaTokenMetadata/TokenMetadata.swift b/Sources/SolanaSwift/SolanaTokenMetadata/TokenMetadata.swift
@@ -22,7 +22,7 @@ public struct TokenMetadata: Hashable, Codable, Equatable {
     public let name: String
     public let decimals: Decimals
     public let logoURI: String?
-    public var tags: [TokenTag] = []
+    public var tags: [TokenTag]
     public let extensions: [String: TokenExtensionValue]?
     public let supply: UInt64?
     public private(set) var isNative = false
@@ -50,46 +50,45 @@ public struct TokenMetadata: Hashable, Codable, Equatable {
     }
 
     public init(
-        _tags: [String]?,
+        tags: [String]?,
         chainId: Int,
         mintAddress: String,
         symbol: String,
         name: String,
         decimals: UInt8,
         logoURI: String?,
-        tags: [TokenTag] = [],
         extensions: [String: TokenExtensionValue]?,
         isNative: Bool = false,
         supply: UInt64? = nil
     ) {
-        self._tags = _tags
+        _tags = tags
         self.chainId = chainId
         self.mintAddress = mintAddress
         self.symbol = symbol
         self.name = name
         self.decimals = decimals
         self.logoURI = logoURI
-        self.tags = tags
+        self.tags = tags?.map { tag in TokenTag(name: tag, description: tag) } ?? []
         self.extensions = extensions
         self.isNative = isNative
         self.supply = supply
     }
 
     public static func unsupported(
+        tags: [String]?,
         mint: String,
         decimals: Decimals,
         symbol: String,
         supply: UInt64?
     ) -> TokenMetadata {
         TokenMetadata(
-            _tags: [],
+            tags: tags,
             chainId: 101,
             mintAddress: mint,
             symbol: symbol,
             name: mint,
             decimals: decimals,
             logoURI: nil,
-            tags: [],
             extensions: nil,
             supply: supply
         )

diff --git a/Tests/SolanaSwiftUnitTests/SolanaTokenMetadata/TokensRepositoryPerformanceTests.swift b/Tests/SolanaSwiftUnitTests/SolanaTokenMetadata/TokensRepositoryPerformanceTests.swift
@@ -1,5 +1,5 @@
-@testable import SolanaSwift
 import XCTest
+@testable import SolanaSwift
 
 class TokensRepositoryPerformanceTests: XCTestCase {
     func testGetPerformance() async throws {
@@ -17,7 +17,7 @@ class TokensRepositoryPerformanceTests: XCTestCase {
             let uuid = UUID().uuidString
 
             records[uuid] = TokenMetadata(
-                _tags: nil,
+                tags: nil,
                 chainId: 0,
                 mintAddress: uuid,
                 symbol: String(uuid.prefix(3)),