From 65d71009eec3f3fbc807040a788e76cc6afffb8f Mon Sep 17 00:00:00 2001
From: Chung Tran <bigearsenal@gmail.com>
Date: Wed, 11 May 2022 16:24:47 +0700
Subject: [PATCH] feat: update SolanaSwift

---
 Package.resolved                              | 4 ++--
 Package.swift                                 | 2 +-
 Sources/OrcaSwapSwift/OrcaSwap/OrcaSwap.swift | 7 ++-----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/Package.resolved b/Package.resolved
index f7c035f..b914e42 100644
--- a/Package.resolved
+++ b/Package.resolved
@@ -86,8 +86,8 @@
         "package": "SolanaSwift",
         "repositoryURL": "https://github.com/p2p-org/solana-swift.git",
         "state": {
-          "branch": "test/quick-merge-for-implementation",
-          "revision": "7968f07fa1b68ddb46a16012e16463c62c26c4d4",
+          "branch": "refactor/pwn-3297",
+          "revision": "a4345bb8e7dc0994090e2b1862255f3bdf3357b3",
           "version": null
         }
       },
diff --git a/Package.swift b/Package.swift
index 3e2b55f..f6c8ace 100644
--- a/Package.swift
+++ b/Package.swift
@@ -18,7 +18,7 @@ let package = Package(
             targets: ["OrcaSwapSwift"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/p2p-org/solana-swift.git", branch: "test/quick-merge-for-implementation")
+        .package(url: "https://github.com/p2p-org/solana-swift.git", branch: "refactor/pwn-3297")
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
diff --git a/Sources/OrcaSwapSwift/OrcaSwap/OrcaSwap.swift b/Sources/OrcaSwapSwift/OrcaSwap/OrcaSwap.swift
index 93c8ccc..80f5f58 100644
--- a/Sources/OrcaSwapSwift/OrcaSwap/OrcaSwap.swift
+++ b/Sources/OrcaSwapSwift/OrcaSwap/OrcaSwap.swift
@@ -8,14 +8,11 @@
 import Foundation
 import SolanaSwift
 
-public class OrcaSwap<
-    SolanaAPIClient: SolanaSwift.SolanaAPIClient,
-    BlockchainClient: SolanaBlockchainClient
->: OrcaSwapType {
+public class OrcaSwap: OrcaSwapType {
     // MARK: - Properties
     private var cache: SwapInfo?
     let apiClient: OrcaSwapAPIClient
-    let blockchainClient: BlockchainClient
+    let blockchainClient: SolanaBlockchainClient
     let solanaClient: SolanaAPIClient
     let accountStorage: SolanaAccountStorage