Merge pull request #27 from portto/chore/bumpVersion

bump version and update BloctoSDK to 0.5.0
blocto · Jan 12, 2023 · f4fdc87 · f4fdc87
2 parents 7be6022 + 7688de8
commit f4fdc87
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 25 deletions.
diff --git a/Demo/FCL_Cocoa_Demo/Podfile.lock b/Demo/FCL_Cocoa_Demo/Podfile.lock
@@ -1,11 +1,11 @@
 PODS:
   - _NIODataStructures (2.40.0)
   - BigInt (5.2.0)
-  - BloctoSDK/Core (0.4.2)
-  - BloctoSDK/Flow (0.4.2):
-    - BloctoSDK/Core (~> 0.4.2)
-    - FlowSDK (~> 0.4.2)
-  - Cadence (0.4.2):
+  - BloctoSDK/Core (0.5.0)
+  - BloctoSDK/Flow (0.5.0):
+    - BloctoSDK/Core (~> 0.5.0)
+    - FlowSDK (~> 0.5.0)
+  - Cadence (0.5.0):
     - BigInt (~> 5.2.0)
     - CryptoSwift (~> 1.5.1)
   - CGRPCZlibp (1.8.2)
@@ -18,14 +18,14 @@ PODS:
   - CNIOLinux (2.40.0)
   - CNIOWindows (2.40.0)
   - CryptoSwift (1.5.1)
-  - FCL-SDK (0.2.1):
-    - BloctoSDK/Flow (~> 0.4.2)
+  - FCL-SDK (0.2.2):
+    - BloctoSDK/Flow (~> 0.5.0)
     - SwiftyJSON
-  - FlowSDK (0.4.2):
-    - FlowSDK/FlowSDK (= 0.4.2)
-  - FlowSDK/FlowSDK (0.4.2):
+  - FlowSDK (0.5.0):
+    - FlowSDK/FlowSDK (= 0.5.0)
+  - FlowSDK/FlowSDK (0.5.0):
     - BigInt (~> 5.2.0)
-    - Cadence (~> 0.4.2)
+    - Cadence (~> 0.5.0)
     - CryptoSwift (~> 1.5.1)
     - gRPC-Swiftp (~> 1.8.2)
     - secp256k1Swift (~> 0.7.4)
@@ -235,8 +235,8 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   _NIODataStructures: 3d45d8e70a1d17a15b1dc59d102c63dbc0525ffd
   BigInt: f668a80089607f521586bbe29513d708491ef2f7
-  BloctoSDK: 341d7e5e42d22ecc793f5846fb3443ce5edf59e6
-  Cadence: 2aa3c6d84e3de70a5decf50a0c19658af2707d6a
+  BloctoSDK: ee7b4dfe3fe249fb27254d42d6cdb3de4b268544
+  Cadence: f354a678487ab17716acd61ddbb637130e9642b8
   CGRPCZlibp: 2f3e1e7a6d6cb481d4d1a26d3ec09aefacf09cbb
   CNIOAtomics: 8edf08644e5e6fa0f021c239be9e8beb1cd9ef18
   CNIOBoringSSL: 2c9c96c2e95f15e83fb8d26b9738d939cc39ae33
@@ -246,8 +246,8 @@ SPEC CHECKSUMS:
   CNIOLinux: 62e3505f50de558c393dc2f273dde71dcce518da
   CNIOWindows: 3047f2d8165848a3936a0a755fee27c6b5ee479b
   CryptoSwift: c4f2debceb38bf44c80659afe009f71e23e4a082
-  FCL-SDK: 50af02092e99b25a277ff680a2b1112a7179f4d0
-  FlowSDK: 84883187f3f6797438b59474ebeac40be4a96a86
+  FCL-SDK: dece55b22cdf390d837d12d675ba559b58c408dc
+  FlowSDK: 08c8b36cdc7b1c0d7017504592e8d13042e71bd0
   gRPC-Swiftp: 1f5a05ce5b544bff3dce93223e72829daac26113
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
   RxCocoa: 94f817b71c07517321eb4f9ad299112ca8af743b

diff --git a/FCL-SDK.podspec b/FCL-SDK.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FCL-SDK'
-  s.version          = '0.2.2'
+  s.version          = '0.3.0'
   s.summary          = 'Flow Client Library Swift version.'
 
   s.homepage         = 'https://github.com/portto/fcl-swift'
@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '13.0'
 
   s.source_files  = "Sources/**/*"
-  s.dependency "BloctoSDK/Flow", "~> 0.4.2"
+  s.dependency "BloctoSDK/Flow", "~> 0.5.0"
   s.dependency "SwiftyJSON"
 
 end
diff --git a/README.md b/README.md
@@ -26,14 +26,14 @@ This repo is inspired by [fcl-js](https://github.com/onflow/fcl-js) and [fcl-swi
 FCL-SDK is available through [CocoaPods](https://cocoapods.org). You can include specific subspec to install, simply add the following line to your Podfile:
 
 ```ruby
-pod 'FCL-SDK', '~> 0.2.2'
+pod 'FCL-SDK', '~> 0.3.0'
 ```
 
 ### Swift Package Manager
 
 
 ```swift
-.package(url: "https://github.com/portto/fcl-swift.git", .upToNextMinor(from: "0.2.2"))
+.package(url: "https://github.com/portto/fcl-swift.git", .upToNextMinor(from: "0.3.0"))
 ```
 
 Here's an example PackageDescription:
@@ -51,7 +51,7 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/portto/fcl-swift.git", .upToNextMinor(from: "0.2.2"))
+        .package(url: "https://github.com/portto/fcl-swift.git", .upToNextMinor(from: "0.3.0"))
     ],
     targets: [
         .target(

diff --git a/Sources/FCL-SDK/AppUtilities/AppUtilities.swift b/Sources/FCL-SDK/AppUtilities/AppUtilities.swift
@@ -99,7 +99,8 @@ public enum AppUtilities {
         case .testnet:
             return Address(hexString: "0x74daa6f9c7ef24b1")
         case .canarynet,
-             .emulator:
+                .sandboxnet,
+                .emulator:
             throw FCLError.currentNetworkNotSupported
         }
     }

diff --git a/Sources/FCL-SDK/WalletProvider/BloctoWalletProvider.swift b/Sources/FCL-SDK/WalletProvider/BloctoWalletProvider.swift
@@ -333,6 +333,8 @@ public final class BloctoWalletProvider: WalletProvider {
             return .dev
         case .canarynet:
             return nil
+        case .sandboxnet:
+            return nil
         case .emulator:
             return nil
         }

diff --git a/Sources/FCL-SDK/WalletProvider/DapperWalletProvider.swift b/Sources/FCL-SDK/WalletProvider/DapperWalletProvider.swift
@@ -26,13 +26,13 @@ public final class DapperWalletProvider: WalletProvider {
     // mainnet only for now
     private var accessNodeApiString: String {
         switch fcl.config.network {
-        case .testnet:
+        case .testnet,
+                .canarynet,
+                .sandboxnet,
+                .emulator:
             return ""
         case .mainnet:
             return "https://dapper-http-post.vercel.app/api/authn"
-        case .canarynet,
-             .emulator:
-            return ""
         }
     }