feat: add usdt wallet and paykit payments

Bitkit.xcodeproj/project.pbxproj

@@ -990,6 +990,10 @@
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
+				USDT_BRIDGES_URL = "https://bitkit.to/v1/usdt/bridges";
+				USDT_BUNDLER_URL = "https://bitkit.to/v1/usdt/rpc";
+				USDT_DEPOSITS_URL = "https://bitkit.to/v1/usdt/deposits";
+				USDT_RPC_URL = "https://bitkit.to/v1/usdt/chain-rpc";
 			};
 			name = Debug;
 		};
@@ -1039,6 +1043,10 @@
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
+				USDT_BRIDGES_URL = "https://bitkit.to/v1/usdt/bridges";
+				USDT_BUNDLER_URL = "https://bitkit.to/v1/usdt/rpc";
+				USDT_DEPOSITS_URL = "https://bitkit.to/v1/usdt/deposits";
+				USDT_RPC_URL = "https://bitkit.to/v1/usdt/chain-rpc";
 			};
 			name = Release;
 		};
@@ -1226,7 +1234,7 @@
 			repositoryURL = "https://github.com/synonymdev/bitkit-core";
 			requirement = {
 				kind = exactVersion;
-				version = 0.5.18;
+				version = "0.8.0-rc6";
 			};
 		};
 		96E493A22C942FD1000E8BC2 /* XCRemoteSwiftPackageReference "swift-secp256k1" */ = {

Bitkit/AppScene.swift

@@ -402,10 +402,6 @@ struct AppScene: View {
         PaykitFeatureFlags.enforceBuildAvailability()
         ContactPaymentsService.enableAllPaymentOptions()
 
-        _app = StateObject(wrappedValue: AppViewModel(
-            sheetViewModel: sheetViewModel,
-            navigationViewModel: navigationViewModel
-        ))
         _sheets = StateObject(wrappedValue: sheetViewModel)
         _navigation = StateObject(wrappedValue: navigationViewModel)
         let feeEstimatesManager = FeeEstimatesManager()
@@ -414,6 +410,11 @@ struct AppScene: View {
             sheetViewModel: sheetViewModel,
             feeEstimatesManager: feeEstimatesManager
         )
+        _app = StateObject(wrappedValue: AppViewModel(
+            sheetViewModel: sheetViewModel,
+            navigationViewModel: navigationViewModel,
+            usdtBalance: { walletVm.usdtWallet.balance }
+        ))
         _wallet = StateObject(wrappedValue: walletVm)
         _currency = StateObject(wrappedValue: CurrencyViewModel())
         _blocktank = StateObject(wrappedValue: BlocktankViewModel())
@@ -577,6 +578,7 @@ struct AppScene: View {
             .environment(trezorViewModel)
             .environment(jadeManager)
             .environment(hwWalletManager)
+            .environment(wallet.usdtWallet)
             .environment(calculatorInputManager)
             .environment(paykitPaymentRequestManager)
     }
@@ -658,6 +660,17 @@ struct AppScene: View {
 
     private var appEventContent: some View {
         paykitEventContent
+            .onChange(of: wallet.usdtWallet.hasFundsOrPendingTransfers, initial: true) { _, hasFundsOrPendingTransfers in
+                settings.protectUsdtFunds(hasFundsOrPendingTransfers)
+            }
+            .onChange(of: settings.usdtPreference) { _, _ in
+                PublicPaykitService.setCleanupPending(true)
+                Task {
+                    await retryPendingPaykitEndpointRemoval()
+                    let keys = contactsManager.contacts.map(\.publicKey)
+                    await PrivatePaykitService.shared.refreshSavedContactEndpoints(for: keys, savedPublicKeys: keys, wallet: wallet)
+                }
+            }
             .onChange(of: sheets.activeSheetConfiguration?.id) { _, activeSheetId in
                 guard activeSheetId == nil, !sheets.isReplacingSheet else { return }
                 scheduleNextIncomingPaykitItemPresentation()
@@ -1328,6 +1341,7 @@ struct AppScene: View {
         paykitPaymentRequestManager.updateSavedPublicKeys(contactsManager.contacts.map(\.publicKey))
         if mode == .full {
             await PaykitPaymentProofService.shared.reconcile()
+            await PaykitUsdtPaymentService.shared.reconcile(wallet: wallet.usdtWallet)
         }
         guard !Task.isCancelled, !onlyWhileActive || isPaykitSceneActive else { return false }
         guard let identity = pubkyProfile.publicKey else { return false }
@@ -1516,7 +1530,7 @@ struct AppScene: View {
                         }
                         return
                     }
-                    guard case let .opened(paymentTarget, privatePaymentContext) = result else {
+                    guard case let .opened(paymentTarget, privatePaymentContext, endpoints) = result else {
                         deferIncomingPaykitPaymentRequestPresentation(
                             request,
                             reason: result.incomingPaymentRequestFailureReason ?? .resolutionFailed
@@ -1527,7 +1541,8 @@ struct AppScene: View {
                     let contactPaymentContext = ContactPaymentContext(
                         publicKey: request.counterparty,
                         privatePaymentContext: privatePaymentContext,
-                        incomingPaymentRequest: request
+                        incomingPaymentRequest: request,
+                        endpoints: endpoints
                     )
                     guard app.claimContactPaymentContext(contactPaymentContext) else { return }
                     preparation.paymentContext = contactPaymentContext

Bitkit/Assets.xcassets/Illustrations/usdt-coins-received.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images": [
+    {
+      "idiom": "universal",
+      "scale": "1x"
+    },
+    {
+      "idiom": "universal",
+      "scale": "2x"
+    },
+    {
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "usdt-coins-received.png"
+    }
+  ],
+  "info": {
+    "author": "xcode",
+    "version": 1
+  }
+}

Bitkit/Assets.xcassets/icons/paper-plane-tilt.imageset/Contents.json

@@ -0,0 +1,16 @@
+{
+  "images": [
+    {
+      "filename": "paper-plane-tilt.svg",
+      "idiom": "universal"
+    }
+  ],
+  "info": {
+    "author": "xcode",
+    "version": 1
+  },
+  "properties": {
+    "preserves-vector-representation": true,
+    "template-rendering-intent": "template"
+  }
+}

Bitkit/Assets.xcassets/icons/permission-folder.imageset/Contents.json

@@ -0,0 +1,16 @@
+{
+  "images": [
+    {
+      "filename": "permission-folder.svg",
+      "idiom": "universal"
+    }
+  ],
+  "info": {
+    "author": "xcode",
+    "version": 1
+  },
+  "properties": {
+    "preserves-vector-representation": true,
+    "template-rendering-intent": "template"
+  }
+}

Bitkit/Assets.xcassets/tether-circle.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images": [
+    {
+      "filename": "tether-circle.png",
+      "idiom": "universal"
+    }
+  ],
+  "info": {
+    "author": "xcode",
+    "version": 1
+  }
+}

Bitkit/Assets.xcassets/tether-coin.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images": [
+    {
+      "filename": "tether-coin.png",
+      "idiom": "universal"
+    }
+  ],
+  "info": {
+    "author": "xcode",
+    "version": 1
+  }
+}

Bitkit/Assets.xcassets/tether.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images": [
+    {
+      "filename": "tether.png",
+      "idiom": "universal"
+    }
+  ],
+  "info": {
+    "author": "xcode",
+    "version": 1
+  }
+}

Bitkit/Assets.xcassets/usdt-network.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images": [
+    {
+      "filename": "usdt-network.png",
+      "idiom": "universal"
+    }
+  ],
+  "info": {
+    "author": "xcode",
+    "version": 1
+  }
+}

Bitkit/Assets.xcassets/usdt-settings.imageset/Contents.json

@@ -0,0 +1,16 @@
+{
+  "images": [
+    {
+      "filename": "usdt-settings.svg",
+      "idiom": "universal"
+    }
+  ],
+  "info": {
+    "author": "xcode",
+    "version": 1
+  },
+  "properties": {
+    "preserves-vector-representation": true,
+    "template-rendering-intent": "template"
+  }
+}

Bitkit/Components/Activity/ActivityList.swift

@@ -2,18 +2,11 @@ import BitkitCore
 import SwiftUI
 
 struct ActivityList: View {
-    @AppStorage(PaykitFeatureFlags.uiEnabledKey) private var isPaykitUIEnabled = PaykitFeatureFlags.uiEnabledByDefault
-
+    @Environment(UsdtWalletManager.self) private var usdt
     @EnvironmentObject var activity: ActivityListViewModel
-    @EnvironmentObject var contactsManager: ContactsManager
-    @EnvironmentObject var feeEstimatesManager: FeeEstimatesManager
 
     let viewType: ActivityViewType
 
-    private var isPaykitUIActive: Bool {
-        PaykitFeatureFlags.isUIAvailable && isPaykitUIEnabled
-    }
-
     enum ActivityViewType {
         case all
         case lightning
@@ -22,31 +15,38 @@ struct ActivityList: View {
 
     var body: some View {
         let activities = getActivities()
-        let groupedItems = activity.groupActivities(activities)
-
-        if !groupedItems.isEmpty {
+        let rows = WalletActivity.grouped(WalletActivity.merged(activities, filteredUsdt))
+        if !rows.isEmpty {
             LazyVStack(alignment: .leading, spacing: 16) {
-                ForEach(Array(zip(groupedItems.indices, groupedItems)), id: \.1) { index, groupItem in
-                    switch groupItem {
+                ForEach(Array(rows.enumerated()), id: \.element) { index, item in
+                    switch item {
                     case let .header(title):
-                        CaptionMText(title)
-                            .frame(height: 34, alignment: .bottom)
-
-                    case let .activity(item):
-                        NavigationLink(value: Route.activityDetail(item)) {
-                            ActivityRow(
-                                item: item,
-                                feeEstimates: feeEstimatesManager.estimates,
-                                contact: isPaykitUIActive ? item.contact(in: contactsManager.contacts) : nil
-                            )
-                        }
-                        .accessibilityIdentifier("Activity-\(index)")
+                        CaptionMText(title).frame(height: 34, alignment: .bottom)
+                    case let .activity(activity):
+                        WalletActivityRow(item: activity).accessibilityIdentifier("Activity-\(index)")
                     }
                 }
             }
         } else {
-            BodyMText(t("wallet__activity_no"))
-                .padding()
+            BodyMText(t("wallet__activity_no")).padding()
+        }
+    }
+
+    private var filteredUsdt: [UsdtTransfer] {
+        guard viewType == .all, activity.selectedTags.isEmpty else { return [] }
+        return usdt.transfers.filter { transfer in
+            let matchesTab: Bool = switch activity.selectedTab {
+            case .all: true
+            case .sent: !transfer.isIncoming
+            case .received: transfer.isIncoming
+            case .other: false
+            }
+            let date = Date(timeIntervalSince1970: TimeInterval(transfer.timestamp))
+            let start = activity.startDate.map { Calendar.current.startOfDay(for: $0) }
+            let end = activity.endDate.flatMap { Calendar.current.date(byAdding: .day, value: 1, to: Calendar.current.startOfDay(for: $0)) }
+            let search = activity.searchText
+            return matchesTab && (start.map { date >= $0 } ?? true) && (end.map { date < $0 } ?? true) &&
+                transfer.matchesActivitySearch(search)
         }
     }
 
@@ -58,3 +58,10 @@ struct ActivityList: View {
         }
     }
 }
+
+extension UsdtTransfer {
+    func matchesActivitySearch(_ search: String) -> Bool {
+        search.isEmpty || search.caseInsensitiveCompare("USDT") == .orderedSame ||
+            recipient.localizedCaseInsensitiveContains(search) || txHash?.localizedCaseInsensitiveContains(search) == true
+    }
+}