Merge pull request #16 from magiclabs/revert-14-ariflo-sc-68590-replace-MagicSDK_Web3-with-Web3.swift

Revert "Replace MagicSDK_Web3 with Web3.swift"

Author: Ariflo

MagicSDK.podspec

@@ -3,7 +3,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'MagicSDK'
-  s.version          = '7.0.0'
+  s.version          = '6.0.0'
   s.summary          = 'Magic IOS SDK'
 
   s.description      = <<-DESC
@@ -20,9 +20,9 @@ TODO: Add long description of the pod here.
 
   s.source_files = 'Sources/MagicSDK/**/*'
 
-  s.dependency 'Web3', '~> 0.5.0'
-  s.dependency 'Web3/ContractABI', '~> 1.0'
-  s.dependency 'Web3/PromiseKit', '~> 1.0'
+  s.dependency 'MagicSDK-Web3', '~> 1.0'
+  s.dependency 'MagicSDK-Web3/ContractABI', '~> 1.0'
+  s.dependency 'MagicSDK-Web3/PromiseKit', '~> 1.0'
 
   s.dependency 'PromiseKit/CorePromise', '~> 6.15'
 

Package.swift

@@ -6,7 +6,7 @@ import PackageDescription
 let package = Package(
     name: "MagicSDK",
     platforms: [
-       .iOS(.v13),
+       .iOS(.v10),
        .macOS(.v10_12)
     ],
     products: [
@@ -16,7 +16,7 @@ let package = Package(
             targets: ["MagicSDK"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/Boilertalk/Web3.swift", from:"0.5.0"),
+        .package(url: "https://github.com/magiclabs/Web3.swift.git", from:"1.1.0"),
         .package(url: "https://github.com/mxcl/PromiseKit.git", from:"6.16.2")
     ],
     targets: [
@@ -25,7 +25,7 @@ let package = Package(
         .target(
             name: "MagicSDK",
             dependencies: [
-                .product(name: "Web3", package: "Web3.swift"),
+                .product(name: "MagicSDK_Web3", package: "Web3.swift"),
                 .product(name: "Web3PromiseKit", package: "Web3.swift"),
                 .product(name: "PromiseKit", package: "PromiseKit"),
                 .product(name: "Web3ContractABI", package: "Web3.swift")

Sources/MagicSDK/Core/Magic.swift

@@ -5,7 +5,7 @@
 //  Created by Jerry Liu on 1/20/20.
 //  Copyright © 2020 Magic Labs Inc. All rights reserved.
 //
-import Web3
+import MagicSDK_Web3
 import WebKit
 
 

Sources/MagicSDK/Core/Provider/RpcProvider.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2020 Magic Labs Inc. All rights reserved.
 //
 
-import Web3
+import MagicSDK_Web3
 import WebKit
 import PromiseKit
 
@@ -76,15 +76,15 @@ public class RpcProvider: NetworkClient, Web3Provider {
         }.catch { error in
             let errResponse = Web3Response<Result>(error: ProviderError.encodingFailed(error))
             response(errResponse)
+//            handleRollbarError(error, log: false)
         }
     }
 }
 
 public typealias Web3ResponseCompletion<Result: Codable> = (_ resp: Web3Response<Result>) -> Void
 
-// Necessary to avoid conflicts with other dependency packages
-internal extension BytesInitializable {
-    init(_ bytes: BytesConvertible ) throws {
+internal extension Web3BytesInitializable {
+    init(_ bytes: Web3BytesRepresentable) throws {
         let bytes = try bytes.makeBytes()
         try self.init(bytes)
     }

Sources/MagicSDK/Modules/Auth/AuthModule.swift

@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import Web3
+import MagicSDK_Web3
 import PromiseKit
 
 public class AuthModule: BaseModule {

Sources/MagicSDK/Modules/BaseModule.swift

@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import Web3
+import MagicSDK_Web3
 import PromiseKit
 
 open class BaseModule {

Sources/MagicSDK/Modules/Connect/ConnectModule.swift

@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import Web3
+import MagicSDK_Web3
 
 public class ConnectModule: BaseModule {
 

Sources/MagicSDK/Modules/User/UserConfiguration.swift

@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import Web3
+import MagicSDK_Web3
 
 /// Get Id Token configuration
 public class GetIdTokenConfiguration: BaseConfiguration {

Sources/MagicSDK/Modules/User/UserModule.swift

@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import Web3
+import MagicSDK_Web3
 import PromiseKit
 
 public class UserModule: BaseModule {

Sources/MagicSDK/Modules/User/UserResponse.swift

@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import Web3
+import MagicSDK_Web3
 
 public protocol MagicResponse: Codable {}