metaplex-foundation · MaksymVereshchaka · May 3, 2023 · Feb 21, 2024
diff --git a/Package.resolved b/Package.resolved
@@ -12,11 +12,11 @@
  },
  {
  "package": "secp256k1",
- "repositoryURL": "https://github.com/Boilertalk/secp256k1.swift.git",
+ "repositoryURL": "https://github.com/GigaBitcoin/secp256k1.swift",
  "state": {
  "branch": null,
- "revision": "cd187c632fb812fd93711a9f7e644adb7e5f97f0",
- "version": "0.1.7"
+ "revision": "48fb20fce4ca3aad89180448a127d5bc16f0e44c",
+ "version": "0.10.0"
  }
  },
  {

diff --git a/Package.swift b/Package.swift
@@ -17,7 +17,7 @@ let package = Package(
  .package(name: "TweetNacl", url: "https://github.com/bitmark-inc/tweetnacl-swiftwrap.git", from: "1.0.2"),
  .package(url: "https://github.com/daltoniam/Starscream.git", from: "4.0.0"),
  .package(name: "Beet", url: "https://github.com/metaplex-foundation/beet-swift.git", from: "1.0.2"),
- .package(name: "secp256k1", url: "https://github.com/Boilertalk/secp256k1.swift.git", from: "0.1.7"),
+ .package(name: "secp256k1", url: "https://github.com/GigaBitcoin/secp256k1.swift", .upToNextMinor(from: "0.10.0")),
  .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"),
  ],
  targets: [

diff --git a/Sources/Solana/Solana.swift → Sources/Solana/SolanaCore.swift b/Sources/Solana/Solana.swift → Sources/Solana/SolanaCore.swift
@@ -6,7 +6,7 @@ public protocol SolanaAccountStorage {
  func clear() -> Result<Void, Error>
 }
 
-public class Solana {
+public class SolanaCore {
  let router: SolanaRouter
  public let socket: SolanaSocket
  public let api: Api

diff --git a/Tests/SolanaTests/Actions/closeTokenAccount/closeTokenAccount.swift b/Tests/SolanaTests/Actions/closeTokenAccount/closeTokenAccount.swift
@@ -3,12 +3,12 @@ import XCTest
 
 class closeTokenAccount: XCTestCase {
  var endpoint = RPCEndpoint.devnetSolana
- var solanaSDK: Solana!
+ var solanaSDK: SolanaCore!
  var signer: Signer!
 
  override func setUpWithError() throws {
  let wallet: TestsWallet = .devnet
- solanaSDK = Solana(router: NetworkingRouter(endpoint: endpoint))
+ solanaSDK = SolanaCore(router: NetworkingRouter(endpoint: endpoint))
  signer = HotAccount(phrase: wallet.testAccount.components(separatedBy: " "))!
  }
 

diff --git a/Tests/SolanaTests/Actions/createAssociatedTokenAccount/createAssociatedTokenAccount.swift b/Tests/SolanaTests/Actions/createAssociatedTokenAccount/createAssociatedTokenAccount.swift
@@ -4,14 +4,14 @@ import Solana
 class createAssociatedTokenAccount: XCTestCase {
  var endpoint = RPCEndpoint.devnetSolana
  var networkRouterMock: NetworkingRouterMock!
- var solana: Solana!
+ var solana: SolanaCore!
  var signer: Signer!
 
  override func setUpWithError() throws {
  try super.setUpWithError()
  let wallet: TestsWallet = .devnet
  networkRouterMock = NetworkingRouterMock()
- solana = Solana(router: networkRouterMock)
+ solana = SolanaCore(router: networkRouterMock)
  signer = HotAccount(phrase: wallet.testAccount.components(separatedBy: " "))!
  }
 

diff --git a/.../SolanaTests/Actions/createAssociatedTokenAccount/createAssociatedTokenAccountAsync.swift b/.../SolanaTests/Actions/createAssociatedTokenAccount/createAssociatedTokenAccountAsync.swift
@@ -6,13 +6,13 @@ import Solana
 class createAssociatedTokenAccountAsync: XCTestCase {
  var endpoint = RPCEndpoint.devnetSolana
  var networkRouterMock: NetworkingRouterMock!
- var solana: Solana!
+ var solana: SolanaCore!
  var signer: Signer!
 
  override func setUpWithError() throws {
  try super.setUpWithError()
  let wallet: TestsWallet = .devnet
- solana = Solana(router: NetworkingRouter(endpoint: .devnetSolana))
+ solana = SolanaCore(router: NetworkingRouter(endpoint: .devnetSolana))
  signer = HotAccount(phrase: wallet.testAccount.components(separatedBy: " "))!
  }
 

diff --git a/Tests/SolanaTests/Actions/createTokenAccount/createTokenAccount.swift b/Tests/SolanaTests/Actions/createTokenAccount/createTokenAccount.swift
@@ -4,14 +4,14 @@ import Solana
 class createTokenAccount: XCTestCase {
  var endpoint = RPCEndpoint.devnetSolana
  var networkRouterMock: NetworkingRouterMock!
- var solana: Solana!
+ var solana: SolanaCore!
  var signer: Signer!
 
  override func setUpWithError() throws {
  try super.setUpWithError()
  let wallet: TestsWallet = .devnet
  networkRouterMock = NetworkingRouterMock()
- solana = Solana(router: networkRouterMock)
+ solana = SolanaCore(router: networkRouterMock)
  signer = HotAccount(phrase: wallet.testAccount.components(separatedBy: " "))!
  }
 

diff --git a/Tests/SolanaTests/Actions/createTokenAccount/createTokenAccountAsync.swift b/Tests/SolanaTests/Actions/createTokenAccount/createTokenAccountAsync.swift
@@ -6,14 +6,14 @@ import Solana
 class createTokenAccountAsync: XCTestCase {
  var endpoint = RPCEndpoint.devnetSolana
  var networkRouterMock: NetworkingRouterMock!
- var solana: Solana!
+ var solana: SolanaCore!
  var signer: Signer!
 
  override func setUpWithError() throws {
  try super.setUpWithError()
  let wallet: TestsWallet = .devnet
  networkRouterMock = NetworkingRouterMock()
- solana = Solana(router: networkRouterMock)
+ solana = SolanaCore(router: networkRouterMock)
  signer = HotAccount(phrase: wallet.testAccount.components(separatedBy: " "))!
  }
 

diff --git a/Tests/SolanaTests/Actions/getMintData/getMintData.swift b/Tests/SolanaTests/Actions/getMintData/getMintData.swift
@@ -3,12 +3,12 @@ import XCTest
 
 class getMintData: XCTestCase {
  var endpoint = RPCEndpoint.devnetSolana
- var solana: Solana!
+ var solana: SolanaCore!
  var signer: Signer!
 
  override func setUpWithError() throws {
  let wallet: TestsWallet = .devnet
- solana = Solana(router: NetworkingRouter(endpoint: endpoint))
+ solana = SolanaCore(router: NetworkingRouter(endpoint: endpoint))
  signer = HotAccount(phrase: wallet.testAccount.components(separatedBy: " "))!
  }
 

diff --git a/Tests/SolanaTests/Actions/getMintData/getMintDataAsync.swift b/Tests/SolanaTests/Actions/getMintData/getMintDataAsync.swift
@@ -5,12 +5,12 @@ import XCTest
 @available(macOS 10.15, *)
 class getMintDataAsync: XCTestCase {
  var endpoint = RPCEndpoint.devnetSolana
- var solana: Solana!
+ var solana: SolanaCore!
  var signer: Signer!
 
  override func setUpWithError() throws {
  let wallet: TestsWallet = .devnet
- solana = Solana(router: NetworkingRouter(endpoint: endpoint))
+ solana = SolanaCore(router: NetworkingRouter(endpoint: endpoint))
  signer = HotAccount(phrase: wallet.testAccount.components(separatedBy: " "))!
  }
 

diff --git a/Tests/SolanaTests/Actions/getTokenWallets/getTokenWallets.swift b/Tests/SolanaTests/Actions/getTokenWallets/getTokenWallets.swift
@@ -3,12 +3,12 @@ import Solana
 
 class getTokenWallets: XCTestCase {
  var endpoint = RPCEndpoint.devnetSolana
- var solana: Solana!
+ var solana: SolanaCore!
  var signer: Signer!
 
  override func setUpWithError() throws {
  let wallet: TestsWallet = .getWallets
- solana = Solana(router: NetworkingRouter(endpoint: endpoint))
+ solana = SolanaCore(router: NetworkingRouter(endpoint: endpoint))
  signer = HotAccount(phrase: wallet.testAccount.components(separatedBy: " "))!
  }
 

diff --git a/Tests/SolanaTests/Actions/getTokenWallets/getTokenWalletsAsync.swift b/Tests/SolanaTests/Actions/getTokenWallets/getTokenWalletsAsync.swift
@@ -5,12 +5,12 @@ import Solana
 @available(macOS 10.15, *)
 class getTokenWalletsAsync: XCTestCase {
  var endpoint = RPCEndpoint.devnetSolana
- var solana: Solana!
+ var solana: SolanaCore!
  var signer: Signer!
 
  override func setUpWithError() throws {
  let wallet: TestsWallet = .getWallets
- solana = Solana(router: NetworkingRouter(endpoint: endpoint))
+ solana = SolanaCore(router: NetworkingRouter(endpoint: endpoint))
  signer = HotAccount(phrase: wallet.testAccount.components(separatedBy: " "))!
  }
 

diff --git a/Tests/SolanaTests/Actions/sendSOL/sendSOL.swift b/Tests/SolanaTests/Actions/sendSOL/sendSOL.swift
@@ -3,12 +3,12 @@ import Solana
 
 class sendSOL: XCTestCase {
  var endpoint = RPCEndpoint.devnetSolana
- var solana: Solana!
+ var solana: SolanaCore!
  var signer: Signer!
 
  override func setUpWithError() throws {
  let wallet: TestsWallet = .devnet
- solana = Solana(router: NetworkingRouter(endpoint: endpoint))
+ solana = SolanaCore(router: NetworkingRouter(endpoint: endpoint))
  signer = HotAccount(phrase: wallet.testAccount.components(separatedBy: " "))! // 5Zzguz4NsSRFxGkHfM4FmsFpGZiCDtY72zH2jzMcqkJx
  }
 

diff --git a/Tests/SolanaTests/Actions/sendSOL/sendSOLAsync.swift b/Tests/SolanaTests/Actions/sendSOL/sendSOLAsync.swift
@@ -5,12 +5,12 @@ import Solana
 @available(macOS 10.15, *)
 class sendSOLAsync: XCTestCase {
  var endpoint = RPCEndpoint.devnetSolana
- var solana: Solana!
+ var solana: SolanaCore!
  var signer: Signer!
 
  override func setUpWithError() throws {
  let wallet: TestsWallet = .devnet
- solana = Solana(router: NetworkingRouter(endpoint: endpoint))
+ solana = SolanaCore(router: NetworkingRouter(endpoint: endpoint))
  signer = HotAccount(phrase: wallet.testAccount.components(separatedBy: " "))! // 5Zzguz4NsSRFxGkHfM4FmsFpGZiCDtY72zH2jzMcqkJx
  }
 

diff --git a/Tests/SolanaTests/Actions/sendSPLTokens/sendSPLTokens.swift b/Tests/SolanaTests/Actions/sendSPLTokens/sendSPLTokens.swift
@@ -3,12 +3,12 @@ import Solana
 
 class sendSPLTokens: XCTestCase {
  var endpoint = RPCEndpoint.devnetSolana
- var solana: Solana!
+ var solana: SolanaCore!
  var signer: Signer!
 
  override func setUpWithError() throws {
  let wallet: TestsWallet = .devnet
- solana = Solana(router: NetworkingRouter(endpoint: endpoint))
+ solana = SolanaCore(router: NetworkingRouter(endpoint: endpoint))
  signer = HotAccount(phrase: wallet.testAccount.components(separatedBy: " "))!
  _ = try solana.api.requestAirdrop(account: signer.publicKey.base58EncodedString, lamports: 100.toLamport(decimals: 9))?.get()
  }

diff --git a/Tests/SolanaTests/Actions/sendSPLTokens/sendSPLTokensAsync.swift b/Tests/SolanaTests/Actions/sendSPLTokens/sendSPLTokensAsync.swift
@@ -5,12 +5,12 @@ import Solana
 @available(macOS 10.15, *)
 class sendSPLTokensAsync: XCTestCase {
  var endpoint = RPCEndpoint.devnetSolana
- var solana: Solana!
+ var solana: SolanaCore!
  var signer: Signer!
 
  override func setUpWithError() throws {
  let wallet: TestsWallet = .devnet
- solana = Solana(router: NetworkingRouter(endpoint: endpoint))
+ solana = SolanaCore(router: NetworkingRouter(endpoint: endpoint))
  signer = HotAccount(phrase: wallet.testAccount.components(separatedBy: " "))!
  }
 

diff --git a/Tests/SolanaTests/Actions/serializeAndSendWithFee/serializeAndSendWithFee.swift b/Tests/SolanaTests/Actions/serializeAndSendWithFee/serializeAndSendWithFee.swift
@@ -3,12 +3,12 @@ import XCTest
 
 class serializeAndSendWithFee: XCTestCase {
  var endpoint = RPCEndpoint.devnetSolana
- var solana: Solana!
+ var solana: SolanaCore!
  var signer: Signer!
 
  override func setUpWithError() throws {
  let wallet: TestsWallet = .devnet
- solana = Solana(router: NetworkingRouter(endpoint: endpoint))
+ solana = SolanaCore(router: NetworkingRouter(endpoint: endpoint))
  signer = HotAccount(phrase: wallet.testAccount.components(separatedBy: " "))!
  }
 

diff --git a/Tests/SolanaTests/Actions/serializeAndSendWithFee/serializeAndSendWithFeeAsync.swift b/Tests/SolanaTests/Actions/serializeAndSendWithFee/serializeAndSendWithFeeAsync.swift
@@ -5,12 +5,12 @@ import XCTest
 @available(macOS 10.15, *)
 class serializeAndSendWithFeeAsync: XCTestCase {
  var endpoint = RPCEndpoint.devnetSolana
- var solana: Solana!
+ var solana: SolanaCore!
  var signer: Signer!
 
  override func setUpWithError() throws {
  let wallet: TestsWallet = .devnet
- solana = Solana(router: NetworkingRouter(endpoint: endpoint))
+ solana = SolanaCore(router: NetworkingRouter(endpoint: endpoint))
  signer = HotAccount(phrase: wallet.testAccount.components(separatedBy: " "))!
  }
 

diff --git a/Tests/SolanaTests/Actions/swap/swap.swift b/Tests/SolanaTests/Actions/swap/swap.swift
@@ -3,13 +3,13 @@ import XCTest
 
 class swap: XCTestCase {
  var endpoint = RPCEndpoint.devnetSolana
- var solana: Solana!
+ var solana: SolanaCore!
  var signer: Signer!
  let publicKey = PublicKey(string: "11111111111111111111111111111111")!
 
  override func setUpWithError() throws {
  let wallet: TestsWallet = .devnet
- solana = Solana(router: NetworkingRouter(endpoint: endpoint))
+ solana = SolanaCore(router: NetworkingRouter(endpoint: endpoint))
  signer = HotAccount(phrase: wallet.testAccount.components(separatedBy: " "))!
  }
 
@@ -20,10 +20,10 @@ class swap: XCTestCase {
  let USDCMintAddress = "2ST2CedQ1QT7f2G31Qws9n7GFj7C56fKnhbxnvLymFwU"
  let USDTMintAddress = "E9ySnfyR467236FjUQKswrXq1qmHmS7WyjbiWo7Fnmgo"
 
- let source = try Solana.PublicKey(string: USDCWallet)
- let sourceMint = try Solana.PublicKey(string: USDCMintAddress)
- let destination = try Solana.PublicKey(string: USDTWallet)
- let destinationMint = try Solana.PublicKey(string: USDTMintAddress)
+ let source = try SolanaCore.PublicKey(string: USDCWallet)
+ let sourceMint = try SolanaCore.PublicKey(string: USDCMintAddress)
+ let destination = try SolanaCore.PublicKey(string: USDTWallet)
+ let destinationMint = try SolanaCore.PublicKey(string: USDTMintAddress)
 
  _ = try solanaSDK.swap(
  source: source,

diff --git a/Tests/SolanaTests/Api/Methods.swift b/Tests/SolanaTests/Api/Methods.swift
@@ -7,12 +7,12 @@ class Methods: XCTestCase {
  urlWebSocket: URL(string: ProcessInfo.processInfo.environment["DEVNET_VALIDATOR_WSS"] ?? "") ?? URL(string: "wss://api.devnet.solana.com")!,
  network: .devnet
  )
- var solana: Solana!
+ var solana: SolanaCore!
  var account: Signer!
 
  override func setUpWithError() throws {
  let wallet: TestsWallet = .devnet
- solana = Solana(router: NetworkingRouter(endpoint: endpoint))
+ solana = SolanaCore(router: NetworkingRouter(endpoint: endpoint))
  account = HotAccount(phrase: wallet.testAccount.components(separatedBy: " "))!
  }
 
@@ -227,7 +227,7 @@ class Methods: XCTestCase {
 
  /*func testGetStakeActivation() {
  // https://explorer.solana.com/address/AUi8iPbT4sDpd3Bi6Jj7TL5LBEiXEEm2137bSkpL6Z9G
- let mainNetSolana = Solana(router: NetworkingRouter(endpoint: .mainnetBetaSolana))
+ let mainNetSolana = SolanaCore(router: NetworkingRouter(endpoint: .mainnetBetaSolana))
  let stakeActivation = try! mainNetSolana.api.getStakeActivation(stakeAccount: "AUi8iPbT4sDpd3Bi6Jj7TL5LBEiXEEm2137bSkpL6Z9G")?.get()
  XCTAssertNotNil(stakeActivation)
  XCTAssertEqual("inactive", stakeActivation!.state)

diff --git a/Tests/SolanaTests/Api/MethodsAsync.swift b/Tests/SolanaTests/Api/MethodsAsync.swift
@@ -9,12 +9,12 @@ class MethodsAsync: XCTestCase {
  urlWebSocket: URL(string: ProcessInfo.processInfo.environment["DEVNET_VALIDATOR_WSS"] ?? "") ?? URL(string: "wss://api.devnet.solana.com")!,
  network: .devnet
  )
- var solana: Solana!
+ var solana: SolanaCore!
  var signer: Signer!
 
  override func setUpWithError() throws {
  let wallet: TestsWallet = .devnet
- solana = Solana(router: NetworkingRouter(endpoint: endpoint))
+ solana = SolanaCore(router: NetworkingRouter(endpoint: endpoint))
  signer = HotAccount(phrase: wallet.testAccount.components(separatedBy: " "))!
  }
 
@@ -157,7 +157,7 @@ class MethodsAsync: XCTestCase {
  }
  /*func testGetStakeActivation() async throws {
  // https://explorer.solana.com/address/AUi8iPbT4sDpd3Bi6Jj7TL5LBEiXEEm2137bSkpL6Z9G
- let mainNetSolana = Solana(router: NetworkingRouter(endpoint: .mainnetBetaSolana))
+ let mainNetSolana = SolanaCore(router: NetworkingRouter(endpoint: .mainnetBetaSolana))
  let stakeActivation = try await mainNetSolana.api.getStakeActivation(stakeAccount: "AUi8iPbT4sDpd3Bi6Jj7TL5LBEiXEEm2137bSkpL6Z9G")
  XCTAssertEqual("active", stakeActivation.state)
  XCTAssertTrue(stakeActivation.active > 0)

diff --git a/Tests/SolanaTests/TokenInfo/TokenInfoTests.swift b/Tests/SolanaTests/TokenInfo/TokenInfoTests.swift
@@ -4,11 +4,11 @@ import XCTest
 
 class TokenInfoTests: XCTestCase {
  var endpoint = RPCEndpoint.mainnetBetaSolana
- var solanaSDK: Solana!
+ var solanaSDK: SolanaCore!
 
  override func setUpWithError() throws {
  let tokenProvider = try! TokenListProvider(path: getFileFrom("TokenInfo/mainnet-beta.tokens"))
- solanaSDK = Solana(router: NetworkingRouter(endpoint: endpoint), tokenProvider: tokenProvider)
+ solanaSDK = SolanaCore(router: NetworkingRouter(endpoint: endpoint), tokenProvider: tokenProvider)
  }
 
  func testCloseAccountInstruction() {