Merge branch 'feature/coinbase-ramp' into feature/fw-adoptation

bnsports · bnsports · commit 71b94fdd807e · 2025-03-24T18:16:52.000+07:00
diff --git a/Podfile b/Podfile
@@ -20,7 +20,7 @@ abstract_target 'fearlessAll' do
   pod 'SVGKit'
   pod 'Charts', '~> 4.1.0'
   pod 'MediaView', :git => 'https://github.com/bnsports/MediaView.git', :branch => 'dev'
-  pod 'FearlessKeys', '0.1.4'
+  pod 'FearlessKeys', '0.1.5'
 
   target 'fearlessTests' do
     inherit! :search_paths
diff --git a/Podfile.lock b/Podfile.lock
@@ -9,7 +9,7 @@ PODS:
   - Cuckoo (2.0.9):
     - Cuckoo/Swift (= 2.0.9)
   - Cuckoo/Swift (2.0.9)
-  - FearlessKeys (0.1.4)
+  - FearlessKeys (0.1.5)
   - FireMock (3.1)
   - Kingfisher (7.10.2)
   - MediaView (0.2.0)
@@ -82,7 +82,7 @@ PODS:
 DEPENDENCIES:
   - Charts (~> 4.1.0)
   - Cuckoo
-  - FearlessKeys (= 0.1.4)
+  - FearlessKeys (= 0.1.5)
   - FireMock
   - Kingfisher (= 7.10.2)
   - MediaView (from `https://github.com/bnsports/MediaView.git`, branch `dev`)
@@ -140,7 +140,7 @@ SPEC CHECKSUMS:
   Charts: ce0768268078eee0336f122c3c4ca248e4e204c5
   CocoaLumberjack: 6a459bc897d6d80bd1b8c78482ec7ad05dffc3f0
   Cuckoo: e2cc9a06a47d3faee7430a261c9c654b79b35f6e
-  FearlessKeys: 5ec2782533624d237c899677a8c10859fbbc6668
+  FearlessKeys: 54697ac7bdb2a16aa4525bed06c8769a351606db
   FireMock: 3eed872059c12f94855413347da83b9d6d1a6fac
   Kingfisher: 99edc495d3b7607e6425f0d6f6847b2abd6d716d
   MediaView: 10ff6a5c7950a7c72c5da9e9b89cc85a981e6abc
@@ -158,6 +158,6 @@ SPEC CHECKSUMS:
   SwiftLint: bd7cfb914762ab5f0cbb632964849571db075706
   SwiftyBeaver: ade157e4f857812e7d7f15f2e3396bb8733f8a1c
 
-PODFILE CHECKSUM: 6eca9a23a0e78699b9b76e0f4a5d70c067f5290f
+PODFILE CHECKSUM: d50f67e5652b6dc7c25c383940113f88a40d89bc
 
 COCOAPODS: 1.15.2
diff --git a/fearless.xcodeproj/project.pbxproj b/fearless.xcodeproj/project.pbxproj
diff --git a/fearless.xcworkspace/xcshareddata/swiftpm/Package.resolved b/fearless.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -141,8 +141,7 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/soramitsu/shared-features-spm.git",
       "state" : {
-        "branch" : "FW-new-ecosystem",
-        "revision" : "53e0a4bbea854ab32e97392365c3e523b9a0dc66"
+        "revision" : "b3e2bf1bc380d0e046b603921cbb63dcefb920cf"
       }
     },
     {
@@ -177,8 +176,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-nio.git",
       "state" : {
-        "revision" : "ba72f31e11275fc5bf060c966cf6c1f36842a291",
-        "version" : "2.79.0"
+        "revision" : "c51907a839e63ebf0ba2076bba73dd96436bd1b9",
+        "version" : "2.81.0"
       }
     },
     {
@@ -204,17 +203,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-nio-ssl.git",
       "state" : {
-        "revision" : "c7e95421334b1068490b5d41314a50e70bab23d1",
-        "version" : "2.29.0"
+        "revision" : "0cc3528ff48129d64ab9cab0b1cd621634edfc6b",
+        "version" : "2.29.3"
       }
     },
     {
       "identity" : "swift-nio-transport-services",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-nio-transport-services.git",
       "state" : {
-        "revision" : "bbd5e63cf949b7db0c9edaf7a21e141c52afe214",
-        "version" : "1.23.0"
+        "revision" : "3c394067c08d1225ba8442e9cffb520ded417b64",
+        "version" : "1.23.1"
       }
     },
     {
diff --git a/fearless/Assets.xcassets/iconCoinbase.imageset/Coinbase SVG Icon.pdf b/fearless/Assets.xcassets/iconCoinbase.imageset/Coinbase SVG Icon.pdf
diff --git a/fearless/Assets.xcassets/iconCoinbase.imageset/Contents.json b/fearless/Assets.xcassets/iconCoinbase.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Coinbase SVG Icon.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/fearless/Common/Helpers/AssetModelMapper.swift b/fearless/Common/Helpers/AssetModelMapper.swift
@@ -100,7 +100,8 @@ extension AssetModelMapper: CoreDataMapperProtocol {
             assetType: assetType,
             priceProvider: priceProvider,
             coingeckoPriceId: entity.priceId,
-            priceData: priceDatas
+            priceData: priceDatas,
+            coinbaseUrl: entity.coinbaseUrl
         )
     }
 
@@ -122,6 +123,7 @@ extension AssetModelMapper: CoreDataMapperProtocol {
         entity.isUtility = model.isUtility
         entity.isNative = model.isNative
         entity.staking = model.staking?.rawValue
+        entity.coinbaseUrl = model.coinbaseUrl
 
         let priceProviderContext = CDPriceProvider(context: context)
         priceProviderContext.type = model.priceProvider?.type.rawValue
diff --git a/fearless/Common/PurchaseProvider/CoinbasePurchaseProvider.swift b/fearless/Common/PurchaseProvider/CoinbasePurchaseProvider.swift
@@ -0,0 +1,46 @@
+import Foundation
+import SSFModels
+import FearlessKeys
+
+final class CoinbasePurchaseProvivder: PurchaseProviderProtocol {
+    enum Constants {
+        static let title = "Coinbase"
+        static let icon = R.image.iconCoinbase()
+    }
+
+    static let baseUrlString = "https://pay.coinbase.com/buy/select-asset"
+
+    private var chainName: String?
+
+    func with(chainName: String) -> Self {
+        self.chainName = chainName
+        return self
+    }
+
+    func buildPurchaseActions(asset: AssetModel, address: String) -> [PurchaseAction] {
+        if let url = buildURLForAsset(asset, address: address) {
+            return [PurchaseAction(title: Constants.title, url: url, icon: Constants.icon!)]
+        }
+        return []
+    }
+
+    private func buildURLForAsset(_ asset: AssetModel, address: String) -> URL? {
+        guard let chainName else {
+            return nil
+        }
+        
+        guard let endpoint = asset.coinbaseUrl?.replacingOccurrences(of: "{address}", with: address) else {
+            return nil
+        }
+        
+        var components = URLComponents(string: Self.baseUrlString.appending(endpoint))
+
+        let queryItems = [
+            URLQueryItem(name: "appId", value: CoinbaseKeys.coinbaseAppId)
+        ]
+
+        components?.queryItems = queryItems
+
+        return components?.url
+    }
+}
diff --git a/fearless/Common/PurchaseProvider/PurchaseAggregator+Default.swift b/fearless/Common/PurchaseProvider/PurchaseAggregator+Default.swift
@@ -1,7 +1,8 @@
 import Foundation
+import SSFModels
 
 extension PurchaseAggregator {
-    static func defaultAggregator(with purchaseProviders: [PurchaseProviderProtocol]?) -> PurchaseAggregator {
+    static func defaultAggregator(with purchaseProviders: [PurchaseProviderProtocol]?, chain: ChainModel) -> PurchaseAggregator {
         let config: ApplicationConfigProtocol = ApplicationConfig.shared
 
         let moonpaySecretKeyData = Data(MoonPayKeys.secretKey.utf8)
@@ -11,12 +12,14 @@ extension PurchaseAggregator {
             MoonpayProviderFactory().createProvider(
                 with: moonpaySecretKeyData,
                 apiKey: config.moonPayApiKey
-            )
+            ),
+            CoinbasePurchaseProvivder()
         ]
         return PurchaseAggregator(providers: purchaseProviders ?? defaultProviders)
             .with(appName: config.purchaseAppName)
             .with(logoUrl: config.logoURL)
             .with(colorCode: R.color.colorPink()!.hexRGB)
             .with(callbackUrl: config.purchaseRedirect)
+            .with(chainName: chain.name)
     }
 }
diff --git a/fearless/Common/PurchaseProvider/PurchaseProvider.swift b/fearless/Common/PurchaseProvider/PurchaseProvider.swift
@@ -30,6 +30,11 @@ extension PurchaseAggregator: PurchaseProviderProtocol {
         providers = providers.map { $0.with(callbackUrl: callbackUrl) }
         return self
     }
+    
+    func with(chainName: String) -> Self {
+        providers = providers.map { $0.with(chainName: chainName ) }
+        return self
+    }
 
     func buildPurchaseActions(asset: AssetModel, address: String) -> [PurchaseAction] {
         providers.flatMap { $0.buildPurchaseActions(asset: asset, address: address) }
diff --git a/fearless/Common/PurchaseProvider/PurchaseProviderProtocol.swift b/fearless/Common/PurchaseProvider/PurchaseProviderProtocol.swift
@@ -13,6 +13,7 @@ protocol PurchaseProviderProtocol {
     func with(logoUrl: URL) -> Self
     func with(colorCode: String) -> Self
     func with(callbackUrl: URL) -> Self
+    func with(chainName: String) -> Self
     func buildPurchaseActions(asset: AssetModel, address: String) -> [PurchaseAction]
 }
 
@@ -32,4 +33,8 @@ extension PurchaseProviderProtocol {
     func with(callbackUrl _: URL) -> Self {
         self
     }
+    
+    func with(chainName _: String) -> Self {
+        self
+    }
 }
diff --git a/fearless/Common/Services/ChainRegistry/ChainSyncService.swift b/fearless/Common/Services/ChainRegistry/ChainSyncService.swift
@@ -14,7 +14,7 @@ enum ChainSyncServiceError: Error {
 }
 
 final class ChainSyncService {
-    static let fetchLocalData = false
+    static let fetchLocalData = true
 
     struct SyncChanges {
         let newOrUpdatedItems: [ChainModel]
diff --git a/fearless/Common/Storage/EntityToModel/ChainModelMapper.swift b/fearless/Common/Storage/EntityToModel/ChainModelMapper.swift
@@ -94,6 +94,7 @@ final class ChainModelMapper {
             }
             return createPriceData(from: priceData)
         }
+        print("CoinbaseURL debug: createAsset: coinbaseUrl: \(entity.coinbaseUrl)")
         return AssetModel(
             id: id,
             name: name,
@@ -110,7 +111,8 @@ final class ChainModelMapper {
             assetType: assetType,
             priceProvider: priceProvider,
             coingeckoPriceId: entity.priceId,
-            priceData: priceDatas
+            priceData: priceDatas,
+            coinbaseUrl: entity.coinbaseUrl
         )
     }
 
@@ -150,6 +152,7 @@ final class ChainModelMapper {
             assetEntity.isUtility = assetModel.isUtility
             assetEntity.isNative = assetModel.isNative
             assetEntity.staking = assetModel.staking?.rawValue
+            assetEntity.coinbaseUrl = assetModel.coinbaseUrl
 
             let priceProviderContext = CDPriceProvider(context: context)
             priceProviderContext.type = assetModel.priceProvider?.type.rawValue
@@ -186,6 +189,7 @@ final class ChainModelMapper {
                 }
             }
             assetEntity.priceData = Set(priceData) as NSSet
+            print("CoinbaseURL debug: updateEntityAsset: coinbaseUrl: \(assetEntity.coinbaseUrl)")
 
             return assetEntity
         }
diff --git a/fearless/Common/Storage/Migration/SubstrateStorage/SubstrateStorageVersion.swift b/fearless/Common/Storage/Migration/SubstrateStorage/SubstrateStorageVersion.swift
@@ -9,6 +9,7 @@ enum SubstrateStorageVersion: String, CaseIterable {
     case version6 = "SubstrateDataModel_v6"
     case version7 = "SubstrateDataModel_v7"
     case version8 = "SubstrateDataModel_v8"
+    case version9 = "SubstrateDataModel_v9"
 
     static var current: SubstrateStorageVersion {
         guard let currentVersion = allCases.last else {
@@ -35,6 +36,8 @@ enum SubstrateStorageVersion: String, CaseIterable {
         case .version7:
             return .version8
         case .version8:
+            return .version9
+        case .version9:
             return nil
         }
     }
diff --git a/fearless/Common/Storage/SubstrateDataModel.xcdatamodeld/.xccurrentversion b/fearless/Common/Storage/SubstrateDataModel.xcdatamodeld/.xccurrentversion
@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>_XCCurrentVersionName</key>
-	<string>SubstrateDataModel_v8.xcdatamodel</string>
+	<string>SubstrateDataModel_v9.xcdatamodel</string>
 </dict>
 </plist>
diff --git a/fearless/Common/Storage/SubstrateDataModel.xcdatamodeld/SubstrateDataModel_v9.xcdatamodel/contents b/fearless/Common/Storage/SubstrateDataModel.xcdatamodeld/SubstrateDataModel_v9.xcdatamodel/contents
diff --git a/fearless/Common/Storage/SubstrateDataStorageFacade.swift b/fearless/Common/Storage/SubstrateDataStorageFacade.swift
diff --git a/fearless/Modules/LiquidityPools/LiquidityPoolDetails/Resources/chains.json b/fearless/Modules/LiquidityPools/LiquidityPoolDetails/Resources/chains.json
diff --git a/fearless/Modules/NewWallet/ChainAccount/ChainAccountPresenter.swift b/fearless/Modules/NewWallet/ChainAccount/ChainAccountPresenter.swift

Original file line number	Diff line number	Diff line change
`@@ -141,8 +141,7 @@`
`141`	`141`	`"kind" : "remoteSourceControl",`
`142`	`142`	`"location" : "https://github.com/soramitsu/shared-features-spm.git",`
`143`	`143`	`"state" : {`
`144`		`- "branch" : "FW-new-ecosystem",`
`145`		`- "revision" : "53e0a4bbea854ab32e97392365c3e523b9a0dc66"`
	`144`	`+ "revision" : "b3e2bf1bc380d0e046b603921cbb63dcefb920cf"`
`146`	`145`	`}`
`147`	`146`	`},`
`148`	`147`	`{`
`@@ -177,8 +176,8 @@`
`177`	`176`	`"kind" : "remoteSourceControl",`
`178`	`177`	`"location" : "https://github.com/apple/swift-nio.git",`
`179`	`178`	`"state" : {`
`180`		`- "revision" : "ba72f31e11275fc5bf060c966cf6c1f36842a291",`
`181`		`- "version" : "2.79.0"`
	`179`	`+ "revision" : "c51907a839e63ebf0ba2076bba73dd96436bd1b9",`
	`180`	`+ "version" : "2.81.0"`
`182`	`181`	`}`
`183`	`182`	`},`
`184`	`183`	`{`
`@@ -204,17 +203,17 @@`
`204`	`203`	`"kind" : "remoteSourceControl",`
`205`	`204`	`"location" : "https://github.com/apple/swift-nio-ssl.git",`
`206`	`205`	`"state" : {`
`207`		`- "revision" : "c7e95421334b1068490b5d41314a50e70bab23d1",`
`208`		`- "version" : "2.29.0"`
	`206`	`+ "revision" : "0cc3528ff48129d64ab9cab0b1cd621634edfc6b",`
	`207`	`+ "version" : "2.29.3"`
`209`	`208`	`}`
`210`	`209`	`},`
`211`	`210`	`{`
`212`	`211`	`"identity" : "swift-nio-transport-services",`
`213`	`212`	`"kind" : "remoteSourceControl",`
`214`	`213`	`"location" : "https://github.com/apple/swift-nio-transport-services.git",`
`215`	`214`	`"state" : {`
`216`		`- "revision" : "bbd5e63cf949b7db0c9edaf7a21e141c52afe214",`
`217`		`- "version" : "1.23.0"`
	`215`	`+ "revision" : "3c394067c08d1225ba8442e9cffb520ded417b64",`
	`216`	`+ "version" : "1.23.1"`
`218`	`217`	`}`
`219`	`218`	`},`
`220`	`219`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ protocol PurchaseProviderProtocol {`
`13`	`13`	`func with(logoUrl: URL) -> Self`
`14`	`14`	`func with(colorCode: String) -> Self`
`15`	`15`	`func with(callbackUrl: URL) -> Self`
	`16`	`+ func with(chainName: String) -> Self`
`16`	`17`	`func buildPurchaseActions(asset: AssetModel, address: String) -> [PurchaseAction]`
`17`	`18`	`}`
`18`	`19`
`@@ -32,4 +33,8 @@ extension PurchaseProviderProtocol {`
`32`	`33`	`func with(callbackUrl _: URL) -> Self {`
`33`	`34`	`self`
`34`	`35`	`}`
	`36`	`+`
	`37`	`+ func with(chainName _: String) -> Self {`
	`38`	`+ self`
	`39`	`+ }`
`35`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ enum ChainSyncServiceError: Error {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`final class ChainSyncService {`
`17`		`- static let fetchLocalData = false`
	`17`	`+ static let fetchLocalData = true`
`18`	`18`
`19`	`19`	`struct SyncChanges {`
`20`	`20`	`let newOrUpdatedItems: [ChainModel]`
Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,7 @@ final class ChainModelMapper {`
`94`	`94`	`}`
`95`	`95`	`return createPriceData(from: priceData)`
`96`	`96`	`}`
	`97`	`+ print("CoinbaseURL debug: createAsset: coinbaseUrl: \(entity.coinbaseUrl)")`
`97`	`98`	`return AssetModel(`
`98`	`99`	`id: id,`
`99`	`100`	`name: name,`
`@@ -110,7 +111,8 @@ final class ChainModelMapper {`
`110`	`111`	`assetType: assetType,`
`111`	`112`	`priceProvider: priceProvider,`
`112`	`113`	`coingeckoPriceId: entity.priceId,`
`113`		`- priceData: priceDatas`
	`114`	`+ priceData: priceDatas,`
	`115`	`+ coinbaseUrl: entity.coinbaseUrl`
`114`	`116`	`)`
`115`	`117`	`}`
`116`	`118`
`@@ -150,6 +152,7 @@ final class ChainModelMapper {`
`150`	`152`	`assetEntity.isUtility = assetModel.isUtility`
`151`	`153`	`assetEntity.isNative = assetModel.isNative`
`152`	`154`	`assetEntity.staking = assetModel.staking?.rawValue`
	`155`	`+ assetEntity.coinbaseUrl = assetModel.coinbaseUrl`
`153`	`156`
`154`	`157`	`let priceProviderContext = CDPriceProvider(context: context)`
`155`	`158`	`priceProviderContext.type = assetModel.priceProvider?.type.rawValue`
`@@ -186,6 +189,7 @@ final class ChainModelMapper {`
`186`	`189`	`}`
`187`	`190`	`}`
`188`	`191`	`assetEntity.priceData = Set(priceData) as NSSet`
	`192`	`+ print("CoinbaseURL debug: updateEntityAsset: coinbaseUrl: \(assetEntity.coinbaseUrl)")`
`189`	`193`
`190`	`194`	`return assetEntity`
`191`	`195`	`}`