Merge pull request #155 from nervosnetwork/rc/v0.23.1

[ᚬmaster] Rc/v0.23.1
ashchan · Oct 19, 2019 · 55999b5 · 55999b5
2 parents ec54621 + 077369f
commit 55999b5
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# [v0.23.1](https://github.com/nervosnetwork/ckb-sdk-swift/compare/v0.23.0...v0.23.1) (2019-10-19)
+
+
+### Features
+
+* Set default fee to 1000 shannons
+
+
+
 # [v0.23.0](https://github.com/nervosnetwork/ckb-sdk-swift/compare/v0.22.0...v0.23.0) (2019-10-19)
 
 

diff --git a/CKB.podspec b/CKB.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "CKB"
-  s.version      = "0.23.0"
+  s.version      = "0.23.1"
   s.summary      = "Swift SDK for Nervos CKB"
 
   s.description  = <<-DESC

diff --git a/CKB.xcodeproj/project.pbxproj b/CKB.xcodeproj/project.pbxproj
@@ -1136,7 +1136,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 0.23.0;
+				MARKETING_VERSION = 0.23.1;
 				PRODUCT_BUNDLE_IDENTIFIER = org.nervos.CKB;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = macosx;
@@ -1167,7 +1167,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 0.23.0;
+				MARKETING_VERSION = 0.23.1;
 				PRODUCT_BUNDLE_IDENTIFIER = org.nervos.CKB;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = macosx;

diff --git a/Podfile.lock b/Podfile.lock
@@ -25,4 +25,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 5c4c4a4a60743a7925b0294f5a96868be334a95c
 
-COCOAPODS: 1.8.3
+COCOAPODS: 1.8.4
diff --git a/Source/Payment/Payment.swift b/Source/Payment/Payment.swift
@@ -23,7 +23,7 @@ public final class Payment {
     public var signedTx: Transaction?
     public var unspentCellCollectorType: UnspentCellCollector.Type! = LiveCellCollector.self
 
-    public init(from: String, to: String, amount: Capacity, fee: Capacity = 0, apiClient: APIClient) throws {
+    public init(from: String, to: String, amount: Capacity, fee: Capacity = 1000, apiClient: APIClient) throws {
         guard let fromHash = AddressGenerator.publicKeyHash(for: from) else {
             throw Error.invalidFromAddress
         }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -25,4 +25,4 @@ SPEC CHECKSUMS:

		PODFILE CHECKSUM: 5c4c4a4a60743a7925b0294f5a96868be334a95c

		COCOAPODS: 1.8.3
		COCOAPODS: 1.8.4