From 7990cddbaa7d3efadebc579b2a0672f39ffbae58 Mon Sep 17 00:00:00 2001 From: Bartosz Rozwarski Date: Mon, 25 Mar 2024 15:30:17 +0100 Subject: [PATCH 1/6] add privacy info manifest file --- Sources/PrivacyInfo.xcprivacy | 44 +++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 Sources/PrivacyInfo.xcprivacy diff --git a/Sources/PrivacyInfo.xcprivacy b/Sources/PrivacyInfo.xcprivacy new file mode 100644 index 000000000..b7158a51b --- /dev/null +++ b/Sources/PrivacyInfo.xcprivacy @@ -0,0 +1,44 @@ + + + + + NSPrivacyCollectedDataTypes + + + NSPrivacyCollectedDataType + + NSPrivacyCollectedDataTypeLinked + + NSPrivacyCollectedDataTypeTracking + + NSPrivacyCollectedDataTypePurposes + + + + + + NSPrivacyTracking + + NSPrivacyTrackingDomains + + NSPrivacyAccessedAPITypes + + + NSPrivacyAccessedAPIType + NSPrivacyAccessedAPICategoryUserDefaults + NSPrivacyAccessedAPITypeReasons + + 1C8F.1 + + + + NSPrivacyAccessedAPIType + + NSPrivacyAccessedAPITypeReasons + + 0A2A.1 + + + + + From aa873baf9cc3ce423533c27d191833a6f5cc04d1 Mon Sep 17 00:00:00 2001 From: Bartosz Rozwarski Date: Mon, 25 Mar 2024 15:39:10 +0100 Subject: [PATCH 2/6] remove trash --- .../xcschemes/WalletConnectHistory.xcscheme | 66 ------- Example/ExampleApp.xcodeproj/project.pbxproj | 30 ---- .../xcschemes/WalletConnectChat.xcscheme | 77 --------- .../xcschemes/WalletConnectSync.xcscheme | 67 -------- .../xcshareddata/xcschemes/Web3Inbox.xcscheme | 67 -------- .../Sync/SyncDerivationServiceTests.swift | 26 --- Example/IntegrationTests/Sync/SyncTests.swift | 161 ------------------ Package.swift | 16 -- 8 files changed, 510 deletions(-) delete mode 100644 .swiftpm/xcode/xcshareddata/xcschemes/WalletConnectHistory.xcscheme delete mode 100644 Example/ExampleApp.xcodeproj/xcshareddata/xcschemes/WalletConnectChat.xcscheme delete mode 100644 Example/ExampleApp.xcodeproj/xcshareddata/xcschemes/WalletConnectSync.xcscheme delete mode 100644 Example/ExampleApp.xcodeproj/xcshareddata/xcschemes/Web3Inbox.xcscheme delete mode 100644 Example/IntegrationTests/Sync/SyncDerivationServiceTests.swift delete mode 100644 Example/IntegrationTests/Sync/SyncTests.swift diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/WalletConnectHistory.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/WalletConnectHistory.xcscheme deleted file mode 100644 index 4311c49f7..000000000 --- a/.swiftpm/xcode/xcshareddata/xcschemes/WalletConnectHistory.xcscheme +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Example/ExampleApp.xcodeproj/project.pbxproj b/Example/ExampleApp.xcodeproj/project.pbxproj index ec7366b09..467cfbd55 100644 --- a/Example/ExampleApp.xcodeproj/project.pbxproj +++ b/Example/ExampleApp.xcodeproj/project.pbxproj @@ -91,8 +91,6 @@ A54195A12934BFEF0035AD19 /* EIP191VerifierTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A541959D2934BFEF0035AD19 /* EIP191VerifierTests.swift */; }; A54195A52934E83F0035AD19 /* Web3 in Frameworks */ = {isa = PBXBuildFile; productRef = A54195A42934E83F0035AD19 /* Web3 */; }; A561C80029DF32CE00DF540D /* HDWalletKit in Frameworks */ = {isa = PBXBuildFile; productRef = A561C7FF29DF32CE00DF540D /* HDWalletKit */; }; - A561C80329DFCCDC00DF540D /* SyncTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A561C80229DFCCDC00DF540D /* SyncTests.swift */; }; - A561C80529DFCD4500DF540D /* WalletConnectSync in Frameworks */ = {isa = PBXBuildFile; productRef = A561C80429DFCD4500DF540D /* WalletConnectSync */; }; A5629AA92876A23100094373 /* ChatService.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5629AA82876A23100094373 /* ChatService.swift */; }; A5629ABD2876CBC000094373 /* ChatListModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5629AB82876CBC000094373 /* ChatListModule.swift */; }; A5629ABE2876CBC000094373 /* ChatListPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5629AB92876CBC000094373 /* ChatListPresenter.swift */; }; @@ -114,7 +112,6 @@ A5629AEA2877F2D600094373 /* WalletConnectChat in Frameworks */ = {isa = PBXBuildFile; productRef = A5629AE92877F2D600094373 /* WalletConnectChat */; }; A5629AF22877F75100094373 /* Starscream in Frameworks */ = {isa = PBXBuildFile; productRef = A5629AF12877F75100094373 /* Starscream */; }; A56AC8F22AD88A5A001C8FAA /* Sequence.swift in Sources */ = {isa = PBXBuildFile; fileRef = A56AC8F12AD88A5A001C8FAA /* Sequence.swift */; }; - A573C53729EC34A600E3CBFD /* SyncDerivationServiceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A573C53629EC34A600E3CBFD /* SyncDerivationServiceTests.swift */; }; A573C53929EC365000E3CBFD /* HDWalletKit in Frameworks */ = {isa = PBXBuildFile; productRef = A573C53829EC365000E3CBFD /* HDWalletKit */; }; A573C53B29EC365800E3CBFD /* HDWalletKit in Frameworks */ = {isa = PBXBuildFile; productRef = A573C53A29EC365800E3CBFD /* HDWalletKit */; }; A573C53D29EC366500E3CBFD /* HDWalletKit in Frameworks */ = {isa = PBXBuildFile; productRef = A573C53C29EC366500E3CBFD /* HDWalletKit */; }; @@ -208,7 +205,6 @@ A5E03DFA286465C700888481 /* SignClientTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5E03DF9286465C700888481 /* SignClientTests.swift */; }; A5E03DFD286465D100888481 /* Stubs.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5E03DFC286465D100888481 /* Stubs.swift */; }; A5E03DFF2864662500888481 /* WalletConnect in Frameworks */ = {isa = PBXBuildFile; productRef = A5E03DFE2864662500888481 /* WalletConnect */; }; - A5E03E01286466EA00888481 /* WalletConnectChat in Frameworks */ = {isa = PBXBuildFile; productRef = A5E03E00286466EA00888481 /* WalletConnectChat */; }; A5E03E1128646F8000888481 /* KeychainStorageMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5E03E1028646F8000888481 /* KeychainStorageMock.swift */; }; A5E22D1A2840C62A00E36487 /* Engine.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5E22D192840C62A00E36487 /* Engine.swift */; }; A5E22D1C2840C85D00E36487 /* App.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5E22D1B2840C85D00E36487 /* App.swift */; }; @@ -470,7 +466,6 @@ A541959B2934BFEF0035AD19 /* SignerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SignerTests.swift; sourceTree = ""; }; A541959C2934BFEF0035AD19 /* EIP1271VerifierTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EIP1271VerifierTests.swift; sourceTree = ""; }; A541959D2934BFEF0035AD19 /* EIP191VerifierTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EIP191VerifierTests.swift; sourceTree = ""; }; - A561C80229DFCCDC00DF540D /* SyncTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyncTests.swift; sourceTree = ""; }; A5629AA82876A23100094373 /* ChatService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatService.swift; sourceTree = ""; }; A5629AB82876CBC000094373 /* ChatListModule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatListModule.swift; sourceTree = ""; }; A5629AB92876CBC000094373 /* ChatListPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatListPresenter.swift; sourceTree = ""; }; @@ -491,7 +486,6 @@ A5629AE728772A0100094373 /* InviteViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InviteViewModel.swift; sourceTree = ""; }; A5629AEF2877F73000094373 /* DefaultSocketFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefaultSocketFactory.swift; sourceTree = ""; }; A56AC8F12AD88A5A001C8FAA /* Sequence.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Sequence.swift; sourceTree = ""; }; - A573C53629EC34A600E3CBFD /* SyncDerivationServiceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyncDerivationServiceTests.swift; sourceTree = ""; }; A57879702A4EDC8100F8D10B /* TextFieldView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextFieldView.swift; sourceTree = ""; }; A578FA312873036400AA7720 /* InputView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InputView.swift; sourceTree = ""; }; A578FA34287304A300AA7720 /* Color.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Color.swift; sourceTree = ""; }; @@ -743,13 +737,11 @@ buildActionMask = 2147483647; files = ( A5E03DFF2864662500888481 /* WalletConnect in Frameworks */, - A561C80529DFCD4500DF540D /* WalletConnectSync in Frameworks */, A5E03DF52864651200888481 /* Starscream in Frameworks */, A5C8BE85292FE20B006CC85C /* Web3 in Frameworks */, C5DD5BE1294E09E3008FD3A4 /* Web3Wallet in Frameworks */, A5B6C0F32A6EAB1700927332 /* WalletConnectNotify in Frameworks */, A573C53B29EC365800E3CBFD /* HDWalletKit in Frameworks */, - A5E03E01286466EA00888481 /* WalletConnectChat in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1034,15 +1026,6 @@ path = Signer; sourceTree = ""; }; - A561C80129DFCCD300DF540D /* Sync */ = { - isa = PBXGroup; - children = ( - A561C80229DFCCDC00DF540D /* SyncTests.swift */, - A573C53629EC34A600E3CBFD /* SyncDerivationServiceTests.swift */, - ); - path = Sync; - sourceTree = ""; - }; A5629AA42876A19D00094373 /* DomainLayer */ = { isa = PBXGroup; children = ( @@ -1450,7 +1433,6 @@ isa = PBXGroup; children = ( 847F07FE2A25DBC700B2A5A4 /* XPlatform */, - A561C80129DFCCD300DF540D /* Sync */, 849D7A91292E2115006A2BD4 /* Push */, 84CEC64728D8A98900D081A8 /* Pairing */, A5E03E0A28646A8A00888481 /* Stubs */, @@ -2027,10 +2009,8 @@ packageProductDependencies = ( A5E03DF42864651200888481 /* Starscream */, A5E03DFE2864662500888481 /* WalletConnect */, - A5E03E00286466EA00888481 /* WalletConnectChat */, A5C8BE84292FE20B006CC85C /* Web3 */, C5DD5BE0294E09E3008FD3A4 /* Web3Wallet */, - A561C80429DFCD4500DF540D /* WalletConnectSync */, A573C53A29EC365800E3CBFD /* HDWalletKit */, A5B6C0F22A6EAB1700927332 /* WalletConnectNotify */, ); @@ -2387,10 +2367,8 @@ buildActionMask = 2147483647; files = ( A51606F92A2F47BD00CACB92 /* DefaultBIP44Provider.swift in Sources */, - A573C53729EC34A600E3CBFD /* SyncDerivationServiceTests.swift in Sources */, A5A0843E29D2F624000B9B17 /* DefaultCryptoProvider.swift in Sources */, 84CEC64628D89D6B00D081A8 /* PairingTests.swift in Sources */, - A561C80329DFCCDC00DF540D /* SyncTests.swift in Sources */, 767DC83528997F8E00080FA9 /* EthSendTransaction.swift in Sources */, 8439CB89293F658E00F2F2E2 /* PushMessage.swift in Sources */, A518B31428E33A6500A2CE93 /* InputConfig.swift in Sources */, @@ -3390,10 +3368,6 @@ package = A561C7FE29DF32CE00DF540D /* XCRemoteSwiftPackageReference "HDWallet" */; productName = HDWalletKit; }; - A561C80429DFCD4500DF540D /* WalletConnectSync */ = { - isa = XCSwiftPackageProductDependency; - productName = WalletConnectSync; - }; A5629AE92877F2D600094373 /* WalletConnectChat */ = { isa = XCSwiftPackageProductDependency; productName = WalletConnectChat; @@ -3481,10 +3455,6 @@ isa = XCSwiftPackageProductDependency; productName = WalletConnect; }; - A5E03E00286466EA00888481 /* WalletConnectChat */ = { - isa = XCSwiftPackageProductDependency; - productName = WalletConnectChat; - }; C5133A77294125CC00A8314C /* Web3 */ = { isa = XCSwiftPackageProductDependency; package = A5AE354528A1A2AC0059AE8A /* XCRemoteSwiftPackageReference "Web3" */; diff --git a/Example/ExampleApp.xcodeproj/xcshareddata/xcschemes/WalletConnectChat.xcscheme b/Example/ExampleApp.xcodeproj/xcshareddata/xcschemes/WalletConnectChat.xcscheme deleted file mode 100644 index ae2c82e99..000000000 --- a/Example/ExampleApp.xcodeproj/xcshareddata/xcschemes/WalletConnectChat.xcscheme +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Example/ExampleApp.xcodeproj/xcshareddata/xcschemes/WalletConnectSync.xcscheme b/Example/ExampleApp.xcodeproj/xcshareddata/xcschemes/WalletConnectSync.xcscheme deleted file mode 100644 index 4b58c89d1..000000000 --- a/Example/ExampleApp.xcodeproj/xcshareddata/xcschemes/WalletConnectSync.xcscheme +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Example/ExampleApp.xcodeproj/xcshareddata/xcschemes/Web3Inbox.xcscheme b/Example/ExampleApp.xcodeproj/xcshareddata/xcschemes/Web3Inbox.xcscheme deleted file mode 100644 index ae55238ff..000000000 --- a/Example/ExampleApp.xcodeproj/xcshareddata/xcschemes/Web3Inbox.xcscheme +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Example/IntegrationTests/Sync/SyncDerivationServiceTests.swift b/Example/IntegrationTests/Sync/SyncDerivationServiceTests.swift deleted file mode 100644 index 549ed6929..000000000 --- a/Example/IntegrationTests/Sync/SyncDerivationServiceTests.swift +++ /dev/null @@ -1,26 +0,0 @@ -import Foundation -import XCTest -@testable import WalletConnectSync -@testable import WalletConnectSigner - -class SyncDerivationServiceTests: XCTestCase { - - func testDerivation() throws { - let account = Account("eip155:1:0x1FF34C90a0850Fe7227fcFA642688b9712477482")! - let signature = "0xc91265eadb1473d90f8d49d31b7016feb7f7761a2a986ca2146a4b8964f3357569869680154927596a5829ceea925f4196b8a853a29c2c1d5915832fc9f1c6a01c" - let keychain = KeychainStorageMock() - let syncStorage = SyncSignatureStore(keychain: keychain) - let kms = KeyManagementService(keychain: keychain) - let derivationService = SyncDerivationService( - syncStorage: syncStorage, - bip44: DefaultBIP44Provider(), - kms: kms - ) - - try syncStorage.saveSignature(signature, for: account) - - let topic = try derivationService.deriveTopic(account: account, store: "my-user-profile") - - XCTAssertEqual(topic, "741f8902d339c4c16f33fa598a6598b63e5ed125d761374511b2e06562b033eb") - } -} diff --git a/Example/IntegrationTests/Sync/SyncTests.swift b/Example/IntegrationTests/Sync/SyncTests.swift deleted file mode 100644 index 6b03e8ad1..000000000 --- a/Example/IntegrationTests/Sync/SyncTests.swift +++ /dev/null @@ -1,161 +0,0 @@ -import Foundation -import Combine -import XCTest -import Web3 -@testable import WalletConnectSync -@testable import WalletConnectSigner - -final class SyncTests: XCTestCase { - - struct TestObject: DatabaseObject { - let id: String - let value: String - - var databaseId: String { - return id - } - } - - var publishers = Set() - - var client1: SyncClient! - var client2: SyncClient! - - var indexStore1: SyncIndexStore! - var indexStore2: SyncIndexStore! - - var syncStore1: SyncStore! - var syncStore2: SyncStore! - - var signer: MessageSigner! - - let storeName = "SyncTests_store" - - var account: Account { - return Account("eip155:1:" + pk.address.hex(eip55: true))! - } - - let pk = try! EthereumPrivateKey() - - var privateKey: Data { - return Data(pk.rawPrivateKey) - } - - override func setUp() async throws { - indexStore1 = makeIndexStore() - indexStore2 = makeIndexStore() - client1 = makeClient(indexStore: indexStore1, suffix: "❤️") - client2 = makeClient(indexStore: indexStore2, suffix: "💜") - syncStore1 = makeSyncStore(client: client1, indexStore: indexStore1) - syncStore2 = makeSyncStore(client: client2, indexStore: indexStore2) - signer = MessageSignerFactory(signerFactory: DefaultSignerFactory()).create() - } - - func makeClient(indexStore: SyncIndexStore, suffix: String) -> SyncClient { - let syncSignatureStore = SyncSignatureStore(keychain: KeychainStorageMock()) - let keychain = KeychainStorageMock() - let kms = KeyManagementService(keychain: keychain) - let derivationService = SyncDerivationService(syncStorage: syncSignatureStore, bip44: DefaultBIP44Provider(), kms: kms) - let logger = ConsoleLogger(prefix: suffix, loggingLevel: .debug) - let relayClient = RelayClientFactory.create( - relayHost: InputConfig.relayHost, - projectId: InputConfig.projectId, - keyValueStorage: RuntimeKeyValueStorage(), - keychainStorage: keychain, - socketFactory: DefaultSocketFactory(), - networkMonitor: NetworkMonitor(), - logger: logger) - let networkingInteractor = NetworkingClientFactory.create( - relayClient: relayClient, - logger: logger, - keychainStorage: keychain, - keyValueStorage: RuntimeKeyValueStorage()) - let historyStore = CodableStore(defaults: RuntimeKeyValueStorage(), identifier: "historyStore") - let syncHistoryStore = SyncHistoryStore(store: historyStore) - let syncService = SyncService(networkInteractor: networkingInteractor, derivationService: derivationService, signatureStore: syncSignatureStore, indexStore: indexStore, historyStore: syncHistoryStore, logger: logger) - return SyncClient(syncService: syncService, syncSignatureStore: syncSignatureStore) - } - - func makeIndexStore() -> SyncIndexStore { - let store = CodableStore(defaults: RuntimeKeyValueStorage(), identifier: "indexStore") - return SyncIndexStore(store: store) - } - - func makeSyncStore(client: SyncClient, indexStore: SyncIndexStore) -> SyncStore { - let objectStore = KeyedDatabase(storage: RuntimeKeyValueStorage(), identifier: "objectStore") - return SyncStore(name: storeName, syncClient: client, indexStore: indexStore, objectStore: objectStore) - } - - func testSync() async throws { - let setExpectation = expectation(description: "syncSetTest") - let delExpectation = expectation(description: "syncDelTest") - let uptExpectation = expectation(description: "syncUptTest") - - let object = TestObject(id: "id-1", value: "value-1") - let updated = TestObject(id: "id-1", value: "value-2") - - syncStore1.syncUpdatePublisher.sink { (_, _, update) in - switch update { - case .set: - XCTFail() - case .delete: - delExpectation.fulfill() - case .update: - XCTFail() - } - }.store(in: &publishers) - - syncStore2.syncUpdatePublisher.sink { (_, _, update) in - switch update { - case .set: - setExpectation.fulfill() - case .delete: - XCTFail() - case .update: - uptExpectation.fulfill() - } - }.store(in: &publishers) - - // Configure clients - - try await registerClient(client: client1) - try await registerClient(client: client2) - - // Testing SyncStore `set` - - try await syncStore1.set(object: object, for: account) - - wait(for: [setExpectation], timeout: InputConfig.defaultTimeout) - - XCTAssertEqual(try syncStore1.getAll(for: account), [object]) - XCTAssertEqual(try syncStore2.getAll(for: account), [object]) - - // Testing SyncStore `update` - - try await syncStore1.set(object: updated, for: account) - - wait(for: [uptExpectation], timeout: InputConfig.defaultTimeout) - - XCTAssertEqual(try syncStore1.getAll(for: account), [updated]) - XCTAssertEqual(try syncStore2.getAll(for: account), [updated]) - - // Testing SyncStore `delete` - - try await syncStore2.delete(id: object.id, for: account) - - wait(for: [delExpectation], timeout: InputConfig.defaultTimeout) - - XCTAssertEqual(try syncStore1.getAll(for: account), []) - XCTAssertEqual(try syncStore2.getAll(for: account), []) - } - - private func registerClient(client: SyncClient) async throws { - let message = client.getMessage(account: account) - - let signature = try signer.sign(message: message, privateKey: privateKey, type: .eip191) - - try await client.register(account: account, signature: signature) - try await client.create(account: account, store: storeName) - try await client.subscribe(account: account, store: storeName) - } -} diff --git a/Package.swift b/Package.swift index 41f0e9bbc..ac3eeb9e0 100644 --- a/Package.swift +++ b/Package.swift @@ -13,9 +13,6 @@ let package = Package( .library( name: "WalletConnect", targets: ["WalletConnectSign"]), - .library( - name: "WalletConnectChat", - targets: ["WalletConnectChat"]), .library( name: "WalletConnectAuth", targets: ["Auth"]), @@ -37,9 +34,6 @@ let package = Package( .library( name: "WalletConnectNetworking", targets: ["WalletConnectNetworking"]), - .library( - name: "WalletConnectSync", - targets: ["WalletConnectSync"]), .library( name: "WalletConnectVerify", targets: ["WalletConnectVerify"]), @@ -59,10 +53,6 @@ let package = Package( name: "WalletConnectSign", dependencies: ["WalletConnectPairing", "WalletConnectVerify", "WalletConnectSigner"], path: "Sources/WalletConnectSign"), - .target( - name: "WalletConnectChat", - dependencies: ["WalletConnectIdentity", "WalletConnectSync"], - path: "Sources/Chat"), .target( name: "Auth", dependencies: ["WalletConnectPairing", "WalletConnectSigner", "WalletConnectVerify"], @@ -138,18 +128,12 @@ let package = Package( .copy("Resources/Assets.xcassets") ] ), - .target( - name: "WalletConnectSync", - dependencies: ["WalletConnectSigner"]), .testTarget( name: "WalletConnectSignTests", dependencies: ["WalletConnectSign", "WalletConnectUtils", "TestingUtils", "WalletConnectVerify"]), .testTarget( name: "WalletConnectPairingTests", dependencies: ["WalletConnectPairing", "TestingUtils"]), - .testTarget( - name: "ChatTests", - dependencies: ["WalletConnectChat", "WalletConnectUtils", "TestingUtils"]), .testTarget( name: "NotifyTests", dependencies: ["WalletConnectNotify", "TestingUtils"]), From ae70dd6a9f5aa2ef4b263d6e0b9f7881cfecfaa3 Mon Sep 17 00:00:00 2001 From: Bartosz Rozwarski Date: Mon, 25 Mar 2024 16:15:02 +0100 Subject: [PATCH 3/6] add more manifest files --- .../Resources}/PrivacyInfo.xcprivacy | 0 .../Resources/PrivacyInfo.xcprivacy | 44 +++++++++++++++++++ .../Resources/PrivacyInfo.xcprivacy | 44 +++++++++++++++++++ 3 files changed, 88 insertions(+) rename Sources/{ => WalletConnectRelay/Resources}/PrivacyInfo.xcprivacy (100%) create mode 100644 Sources/WalletConnectSign/Resources/PrivacyInfo.xcprivacy create mode 100644 Sources/Web3Wallet/Resources/PrivacyInfo.xcprivacy diff --git a/Sources/PrivacyInfo.xcprivacy b/Sources/WalletConnectRelay/Resources/PrivacyInfo.xcprivacy similarity index 100% rename from Sources/PrivacyInfo.xcprivacy rename to Sources/WalletConnectRelay/Resources/PrivacyInfo.xcprivacy diff --git a/Sources/WalletConnectSign/Resources/PrivacyInfo.xcprivacy b/Sources/WalletConnectSign/Resources/PrivacyInfo.xcprivacy new file mode 100644 index 000000000..b7158a51b --- /dev/null +++ b/Sources/WalletConnectSign/Resources/PrivacyInfo.xcprivacy @@ -0,0 +1,44 @@ + + + + + NSPrivacyCollectedDataTypes + + + NSPrivacyCollectedDataType + + NSPrivacyCollectedDataTypeLinked + + NSPrivacyCollectedDataTypeTracking + + NSPrivacyCollectedDataTypePurposes + + + + + + NSPrivacyTracking + + NSPrivacyTrackingDomains + + NSPrivacyAccessedAPITypes + + + NSPrivacyAccessedAPIType + NSPrivacyAccessedAPICategoryUserDefaults + NSPrivacyAccessedAPITypeReasons + + 1C8F.1 + + + + NSPrivacyAccessedAPIType + + NSPrivacyAccessedAPITypeReasons + + 0A2A.1 + + + + + diff --git a/Sources/Web3Wallet/Resources/PrivacyInfo.xcprivacy b/Sources/Web3Wallet/Resources/PrivacyInfo.xcprivacy new file mode 100644 index 000000000..b7158a51b --- /dev/null +++ b/Sources/Web3Wallet/Resources/PrivacyInfo.xcprivacy @@ -0,0 +1,44 @@ + + + + + NSPrivacyCollectedDataTypes + + + NSPrivacyCollectedDataType + + NSPrivacyCollectedDataTypeLinked + + NSPrivacyCollectedDataTypeTracking + + NSPrivacyCollectedDataTypePurposes + + + + + + NSPrivacyTracking + + NSPrivacyTrackingDomains + + NSPrivacyAccessedAPITypes + + + NSPrivacyAccessedAPIType + NSPrivacyAccessedAPICategoryUserDefaults + NSPrivacyAccessedAPITypeReasons + + 1C8F.1 + + + + NSPrivacyAccessedAPIType + + NSPrivacyAccessedAPITypeReasons + + 0A2A.1 + + + + + From bcf93054f97277de376a0c332d4a045c716681f3 Mon Sep 17 00:00:00 2001 From: Bartosz Rozwarski Date: Mon, 25 Mar 2024 16:20:03 +0100 Subject: [PATCH 4/6] add PrivacyInfo.xcprivacy to package resources --- Package.swift | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Package.swift b/Package.swift index ac3eeb9e0..636d7255a 100644 --- a/Package.swift +++ b/Package.swift @@ -52,7 +52,8 @@ let package = Package( .target( name: "WalletConnectSign", dependencies: ["WalletConnectPairing", "WalletConnectVerify", "WalletConnectSigner"], - path: "Sources/WalletConnectSign"), + path: "Sources/WalletConnectSign", + resources: [.process("Resources/PrivacyInfo.xcprivacy")]), .target( name: "Auth", dependencies: ["WalletConnectPairing", "WalletConnectSigner", "WalletConnectVerify"], @@ -60,7 +61,8 @@ let package = Package( .target( name: "Web3Wallet", dependencies: ["WalletConnectSign", "WalletConnectPush", "WalletConnectVerify"], - path: "Sources/Web3Wallet"), + path: "Sources/Web3Wallet", + resources: [.process("Resources/PrivacyInfo.xcprivacy")]), .target( name: "WalletConnectNotify", dependencies: ["WalletConnectPairing", "WalletConnectIdentity", "WalletConnectPush", "WalletConnectSigner", "Database"], @@ -73,7 +75,7 @@ let package = Package( name: "WalletConnectRelay", dependencies: ["WalletConnectJWT"], path: "Sources/WalletConnectRelay", - resources: [.copy("PackageConfig.json")]), + resources: [.copy("PackageConfig.json"), .process("Resources/PrivacyInfo.xcprivacy")]), .target( name: "WalletConnectKMS", dependencies: ["WalletConnectUtils"], From bae4deedf1502bb2b22a0bdd71f05ca87cfb71f6 Mon Sep 17 00:00:00 2001 From: Bartosz Rozwarski Date: Tue, 26 Mar 2024 08:48:56 +0100 Subject: [PATCH 5/6] add more manifest files --- Package.swift | 18 +++++--- .../Resources/PrivacyInfo.xcprivacy | 44 +++++++++++++++++++ .../Resources/PrivacyInfo.xcprivacy | 44 +++++++++++++++++++ .../Resources/PrivacyInfo.xcprivacy | 44 +++++++++++++++++++ .../Resources/PrivacyInfo.xcprivacy | 44 +++++++++++++++++++ .../Resources/PrivacyInfo.xcprivacy | 44 +++++++++++++++++++ .../Resources/PrivacyInfo.xcprivacy | 44 +++++++++++++++++++ .../Resources/PrivacyInfo.xcprivacy | 44 +++++++++++++++++++ 8 files changed, 320 insertions(+), 6 deletions(-) create mode 100644 Sources/WalletConnectIdentity/Resources/PrivacyInfo.xcprivacy create mode 100644 Sources/WalletConnectModal/Resources/PrivacyInfo.xcprivacy create mode 100644 Sources/WalletConnectNetworking/Resources/PrivacyInfo.xcprivacy create mode 100644 Sources/WalletConnectNotify/Resources/PrivacyInfo.xcprivacy create mode 100644 Sources/WalletConnectPairing/Resources/PrivacyInfo.xcprivacy create mode 100644 Sources/WalletConnectPush/Resources/PrivacyInfo.xcprivacy create mode 100644 Sources/WalletConnectVerify/Resources/PrivacyInfo.xcprivacy diff --git a/Package.swift b/Package.swift index 636d7255a..b255c6b99 100644 --- a/Package.swift +++ b/Package.swift @@ -66,11 +66,13 @@ let package = Package( .target( name: "WalletConnectNotify", dependencies: ["WalletConnectPairing", "WalletConnectIdentity", "WalletConnectPush", "WalletConnectSigner", "Database"], - path: "Sources/WalletConnectNotify"), + path: "Sources/WalletConnectNotify", + resources: [.process("Resources/PrivacyInfo.xcprivacy")]), .target( name: "WalletConnectPush", dependencies: ["WalletConnectNetworking", "WalletConnectJWT"], - path: "Sources/WalletConnectPush"), + path: "Sources/WalletConnectPush", + resources: [.process("Resources/PrivacyInfo.xcprivacy")]), .target( name: "WalletConnectRelay", dependencies: ["WalletConnectJWT"], @@ -82,7 +84,8 @@ let package = Package( path: "Sources/WalletConnectKMS"), .target( name: "WalletConnectPairing", - dependencies: ["WalletConnectNetworking"]), + dependencies: ["WalletConnectNetworking"], + resources: [.process("Resources/PrivacyInfo.xcprivacy")]), .target( name: "WalletConnectSigner", dependencies: ["WalletConnectNetworking"]), @@ -91,7 +94,8 @@ let package = Package( dependencies: ["WalletConnectKMS"]), .target( name: "WalletConnectIdentity", - dependencies: ["WalletConnectNetworking"]), + dependencies: ["WalletConnectNetworking"], + resources: [.process("Resources/PrivacyInfo.xcprivacy")]), .target( name: "WalletConnectUtils", dependencies: ["JSONRPC"]), @@ -117,7 +121,8 @@ let package = Package( path: "Sources/WalletConnectRouter/Router"), .target( name: "WalletConnectVerify", - dependencies: ["WalletConnectUtils", "WalletConnectNetworking"]), + dependencies: ["WalletConnectUtils", "WalletConnectNetworking"], + resources: [.process("Resources/PrivacyInfo.xcprivacy")]), .target( name: "Database", dependencies: ["WalletConnectUtils"]), @@ -127,7 +132,8 @@ let package = Package( exclude: ["Secrets/secrets.json.sample"], resources: [ .copy("Secrets/secrets.json"), - .copy("Resources/Assets.xcassets") + .copy("Resources/Assets.xcassets"), + .process("Resources/PrivacyInfo.xcprivacy"), ] ), .testTarget( diff --git a/Sources/WalletConnectIdentity/Resources/PrivacyInfo.xcprivacy b/Sources/WalletConnectIdentity/Resources/PrivacyInfo.xcprivacy new file mode 100644 index 000000000..b7158a51b --- /dev/null +++ b/Sources/WalletConnectIdentity/Resources/PrivacyInfo.xcprivacy @@ -0,0 +1,44 @@ + + + + + NSPrivacyCollectedDataTypes + + + NSPrivacyCollectedDataType + + NSPrivacyCollectedDataTypeLinked + + NSPrivacyCollectedDataTypeTracking + + NSPrivacyCollectedDataTypePurposes + + + + + + NSPrivacyTracking + + NSPrivacyTrackingDomains + + NSPrivacyAccessedAPITypes + + + NSPrivacyAccessedAPIType + NSPrivacyAccessedAPICategoryUserDefaults + NSPrivacyAccessedAPITypeReasons + + 1C8F.1 + + + + NSPrivacyAccessedAPIType + + NSPrivacyAccessedAPITypeReasons + + 0A2A.1 + + + + + diff --git a/Sources/WalletConnectModal/Resources/PrivacyInfo.xcprivacy b/Sources/WalletConnectModal/Resources/PrivacyInfo.xcprivacy new file mode 100644 index 000000000..b7158a51b --- /dev/null +++ b/Sources/WalletConnectModal/Resources/PrivacyInfo.xcprivacy @@ -0,0 +1,44 @@ + + + + + NSPrivacyCollectedDataTypes + + + NSPrivacyCollectedDataType + + NSPrivacyCollectedDataTypeLinked + + NSPrivacyCollectedDataTypeTracking + + NSPrivacyCollectedDataTypePurposes + + + + + + NSPrivacyTracking + + NSPrivacyTrackingDomains + + NSPrivacyAccessedAPITypes + + + NSPrivacyAccessedAPIType + NSPrivacyAccessedAPICategoryUserDefaults + NSPrivacyAccessedAPITypeReasons + + 1C8F.1 + + + + NSPrivacyAccessedAPIType + + NSPrivacyAccessedAPITypeReasons + + 0A2A.1 + + + + + diff --git a/Sources/WalletConnectNetworking/Resources/PrivacyInfo.xcprivacy b/Sources/WalletConnectNetworking/Resources/PrivacyInfo.xcprivacy new file mode 100644 index 000000000..b7158a51b --- /dev/null +++ b/Sources/WalletConnectNetworking/Resources/PrivacyInfo.xcprivacy @@ -0,0 +1,44 @@ + + + + + NSPrivacyCollectedDataTypes + + + NSPrivacyCollectedDataType + + NSPrivacyCollectedDataTypeLinked + + NSPrivacyCollectedDataTypeTracking + + NSPrivacyCollectedDataTypePurposes + + + + + + NSPrivacyTracking + + NSPrivacyTrackingDomains + + NSPrivacyAccessedAPITypes + + + NSPrivacyAccessedAPIType + NSPrivacyAccessedAPICategoryUserDefaults + NSPrivacyAccessedAPITypeReasons + + 1C8F.1 + + + + NSPrivacyAccessedAPIType + + NSPrivacyAccessedAPITypeReasons + + 0A2A.1 + + + + + diff --git a/Sources/WalletConnectNotify/Resources/PrivacyInfo.xcprivacy b/Sources/WalletConnectNotify/Resources/PrivacyInfo.xcprivacy new file mode 100644 index 000000000..b7158a51b --- /dev/null +++ b/Sources/WalletConnectNotify/Resources/PrivacyInfo.xcprivacy @@ -0,0 +1,44 @@ + + + + + NSPrivacyCollectedDataTypes + + + NSPrivacyCollectedDataType + + NSPrivacyCollectedDataTypeLinked + + NSPrivacyCollectedDataTypeTracking + + NSPrivacyCollectedDataTypePurposes + + + + + + NSPrivacyTracking + + NSPrivacyTrackingDomains + + NSPrivacyAccessedAPITypes + + + NSPrivacyAccessedAPIType + NSPrivacyAccessedAPICategoryUserDefaults + NSPrivacyAccessedAPITypeReasons + + 1C8F.1 + + + + NSPrivacyAccessedAPIType + + NSPrivacyAccessedAPITypeReasons + + 0A2A.1 + + + + + diff --git a/Sources/WalletConnectPairing/Resources/PrivacyInfo.xcprivacy b/Sources/WalletConnectPairing/Resources/PrivacyInfo.xcprivacy new file mode 100644 index 000000000..b7158a51b --- /dev/null +++ b/Sources/WalletConnectPairing/Resources/PrivacyInfo.xcprivacy @@ -0,0 +1,44 @@ + + + + + NSPrivacyCollectedDataTypes + + + NSPrivacyCollectedDataType + + NSPrivacyCollectedDataTypeLinked + + NSPrivacyCollectedDataTypeTracking + + NSPrivacyCollectedDataTypePurposes + + + + + + NSPrivacyTracking + + NSPrivacyTrackingDomains + + NSPrivacyAccessedAPITypes + + + NSPrivacyAccessedAPIType + NSPrivacyAccessedAPICategoryUserDefaults + NSPrivacyAccessedAPITypeReasons + + 1C8F.1 + + + + NSPrivacyAccessedAPIType + + NSPrivacyAccessedAPITypeReasons + + 0A2A.1 + + + + + diff --git a/Sources/WalletConnectPush/Resources/PrivacyInfo.xcprivacy b/Sources/WalletConnectPush/Resources/PrivacyInfo.xcprivacy new file mode 100644 index 000000000..b7158a51b --- /dev/null +++ b/Sources/WalletConnectPush/Resources/PrivacyInfo.xcprivacy @@ -0,0 +1,44 @@ + + + + + NSPrivacyCollectedDataTypes + + + NSPrivacyCollectedDataType + + NSPrivacyCollectedDataTypeLinked + + NSPrivacyCollectedDataTypeTracking + + NSPrivacyCollectedDataTypePurposes + + + + + + NSPrivacyTracking + + NSPrivacyTrackingDomains + + NSPrivacyAccessedAPITypes + + + NSPrivacyAccessedAPIType + NSPrivacyAccessedAPICategoryUserDefaults + NSPrivacyAccessedAPITypeReasons + + 1C8F.1 + + + + NSPrivacyAccessedAPIType + + NSPrivacyAccessedAPITypeReasons + + 0A2A.1 + + + + + diff --git a/Sources/WalletConnectVerify/Resources/PrivacyInfo.xcprivacy b/Sources/WalletConnectVerify/Resources/PrivacyInfo.xcprivacy new file mode 100644 index 000000000..b7158a51b --- /dev/null +++ b/Sources/WalletConnectVerify/Resources/PrivacyInfo.xcprivacy @@ -0,0 +1,44 @@ + + + + + NSPrivacyCollectedDataTypes + + + NSPrivacyCollectedDataType + + NSPrivacyCollectedDataTypeLinked + + NSPrivacyCollectedDataTypeTracking + + NSPrivacyCollectedDataTypePurposes + + + + + + NSPrivacyTracking + + NSPrivacyTrackingDomains + + NSPrivacyAccessedAPITypes + + + NSPrivacyAccessedAPIType + NSPrivacyAccessedAPICategoryUserDefaults + NSPrivacyAccessedAPITypeReasons + + 1C8F.1 + + + + NSPrivacyAccessedAPIType + + NSPrivacyAccessedAPITypeReasons + + 0A2A.1 + + + + + From 39c28ea7cb72320ef72d1312d0be6a597a2e9794 Mon Sep 17 00:00:00 2001 From: llbartekll Date: Tue, 26 Mar 2024 10:01:28 +0000 Subject: [PATCH 6/6] Set User Agent --- Sources/WalletConnectRelay/PackageConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/WalletConnectRelay/PackageConfig.json b/Sources/WalletConnectRelay/PackageConfig.json index 01b85dcdc..e7257d299 100644 --- a/Sources/WalletConnectRelay/PackageConfig.json +++ b/Sources/WalletConnectRelay/PackageConfig.json @@ -1 +1 @@ -{"version": "1.18.1"} +{"version": "1.18.2"}