From 9261e4d7ba1815c52e818c02b98641054d54c34a Mon Sep 17 00:00:00 2001 From: Maxim Makhun Date: Wed, 18 Aug 2021 21:10:26 -0700 Subject: [PATCH 1/3] Update podspec to the new `2.4.0-zksync` version. --- web3swift.podspec => web3swift-zksync.podspec | 10 +++++----- web3swift.xcodeproj/project.pbxproj | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) rename web3swift.podspec => web3swift-zksync.podspec (77%) diff --git a/web3swift.podspec b/web3swift-zksync.podspec similarity index 77% rename from web3swift.podspec rename to web3swift-zksync.podspec index ab32c24d2..bb7800f5d 100755 --- a/web3swift.podspec +++ b/web3swift-zksync.podspec @@ -1,13 +1,13 @@ Pod::Spec.new do |spec| - spec.name = 'web3swift' - spec.version = '2.3.0' + spec.name = 'web3swift-zksync' + spec.version = '2.4.0-zksync' spec.ios.deployment_target = "9.0" - spec.osx.deployment_target = "10.11" + spec.osx.deployment_target = "10.12" spec.license = { :type => 'Apache License 2.0', :file => 'LICENSE.md' } spec.summary = 'Web3 implementation in vanilla Swift for iOS, macOS, and Linux' - spec.homepage = 'https://github.com/matter-labs/web3swift' + spec.homepage = 'https://github.com/zksync-sdk/web3swift' spec.author = {"Alex Vlasov" => "alex.m.vlasov@gmail.com", "Anton Grigorev" => "antongrigorjev2010@gmail.com", "Petr Korolev" => "sky4winder@gmail.com"} - spec.source = { :git => 'https://github.com/matter-labs/web3swift.git', :tag => spec.version.to_s } + spec.source = { :git => 'https://github.com/zksync-sdk/web3swift.git', :tag => spec.version.to_s } spec.source_files = "Sources/web3swift/{Contract,Convenience,EthereumABI,EthereumAddress,HookedFunctions,KeystoreManager,Promises,SwiftRLP,Transaction,Web3}/*.swift", "Sources/web3swift/{Tokens,Utils}/**/*.swift" spec.ios.source_files = 'Sources/web3swift/Browser/*.swift' spec.resource_bundle = { "Browser" => "Sources/web3swift/Browser/*.js" } diff --git a/web3swift.xcodeproj/project.pbxproj b/web3swift.xcodeproj/project.pbxproj index d73eb2dad..fee52cf26 100755 --- a/web3swift.xcodeproj/project.pbxproj +++ b/web3swift.xcodeproj/project.pbxproj @@ -1214,7 +1214,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/opt/homebrew/bin/carthage copy-frameworks\n"; + shellScript = "carthage copy-frameworks\n"; }; 139751F0219AFA500044D2B0 /* Carthage */ = { isa = PBXShellScriptBuildPhase; From b7f162ce6c289589b465c739997d5c5a11be5120 Mon Sep 17 00:00:00 2001 From: Maxim Makhun Date: Tue, 24 Aug 2021 21:15:35 -0400 Subject: [PATCH 2/3] Remove submodule reference. (#1) --- 73a65a1766e605eaeb5d699fcaa8da02 | 1 - 1 file changed, 1 deletion(-) delete mode 160000 73a65a1766e605eaeb5d699fcaa8da02 diff --git a/73a65a1766e605eaeb5d699fcaa8da02 b/73a65a1766e605eaeb5d699fcaa8da02 deleted file mode 160000 index 4b9283599..000000000 --- a/73a65a1766e605eaeb5d699fcaa8da02 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4b9283599f7dc904dda099e820226cc1639e6b82 From c2fc13494395f63358f4d2b2ee45bceff09fe203 Mon Sep 17 00:00:00 2001 From: Maxim Makhun Date: Sun, 26 Sep 2021 21:54:19 -0700 Subject: [PATCH 3/3] Downgrade to Starscream `3.1.0` to prevent library versions mismatch issues. --- Package.swift | 5 ++--- Sources/web3swift/Web3/Web3+WebsocketProvider.swift | 4 ---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Package.swift b/Package.swift index 2d2466274..c0fe61f6a 100755 --- a/Package.swift +++ b/Package.swift @@ -12,12 +12,11 @@ let package = Package( // Products define the executables and libraries produced by a package, and make them visible to other packages. .library(name: "web3swift", targets: ["web3swift"]), ], - dependencies: [ .package(url: "https://github.com/attaswift/BigInt.git", from: "5.2.0"), .package(url: "https://github.com/mxcl/PromiseKit.git", from: "6.15.3"), - .package(url: "https://github.com/daltoniam/Starscream.git", from: "4.0.4"), - .package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", from: "1.4.0"), + .package(url: "https://github.com/daltoniam/Starscream.git", .upToNextMinor(from: "3.1.0")), + .package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", .upToNextMinor(from: "1.4.0")), ], targets: [ // Targets are the basic building blocks of a package. A target can define a module or a test suite. diff --git a/Sources/web3swift/Web3/Web3+WebsocketProvider.swift b/Sources/web3swift/Web3/Web3+WebsocketProvider.swift index 29b0ade77..986304089 100644 --- a/Sources/web3swift/Web3/Web3+WebsocketProvider.swift +++ b/Sources/web3swift/Web3/Web3+WebsocketProvider.swift @@ -93,10 +93,6 @@ public protocol Web3SocketDelegate { /// The default websocket provider. public class WebsocketProvider: Web3Provider, IWebsocketProvider, WebSocketDelegate { - public func didReceive(event: WebSocketEvent, client: WebSocket) { - - } - public func sendAsync(_ request: JSONRPCrequest, queue: DispatchQueue) -> Promise { return Promise(error: Web3Error.inputError(desc: "Sending is unsupported for Websocket provider. Please, use \'sendMessage\'")) }