Refactor code. Update version 0.6.2 -> 0.7.2

horizontalsystems · Nov 18, 2019 · b7ab480 · b7ab480
1 parent 47861a8
commit b7ab480
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 16 deletions.
diff --git a/Erc20Kit.swift.podspec b/Erc20Kit.swift.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |spec|
   spec.name = 'Erc20Kit.swift'
   spec.module_name = 'Erc20Kit'
-  spec.version = '0.6.2'
+  spec.version = '0.7.2'
   spec.summary = 'Erc20 token library for Swift'
 
   spec.homepage = 'https://github.com/horizontalsystems/ethereum-kit-ios'

diff --git a/Erc20Kit/Erc20Kit.xcodeproj/project.pbxproj b/Erc20Kit/Erc20Kit.xcodeproj/project.pbxproj
@@ -260,6 +260,7 @@
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				en,
 				Base,
 			);
 			mainGroup = D001D2DD2251CC7F00165546;
@@ -535,6 +536,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
+				MARKETING_VERSION = 0.7.2;
 				PRODUCT_BUNDLE_IDENTIFIER = io.horizontalsystems.Erc20Kit;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -561,6 +563,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
+				MARKETING_VERSION = 0.7.2;
 				PRODUCT_BUNDLE_IDENTIFIER = io.horizontalsystems.Erc20Kit;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;

diff --git a/Erc20Kit/Erc20Kit/Core/DataProvider.swift b/Erc20Kit/Erc20Kit/Core/DataProvider.swift
@@ -56,7 +56,7 @@ extension DataProvider: IDataProvider {
     }
 
     func sendSingle(contractAddress: Data, transactionInput: Data, gasPrice: Int, gasLimit: Int) -> Single<Data> {
-        ethereumKit.sendSingle(to: contractAddress, value: 0, transactionInput: transactionInput, gasPrice: gasPrice, gasLimit: gasLimit)
+        ethereumKit.sendSingle(address: contractAddress, value: 0, transactionInput: transactionInput, gasPrice: gasPrice, gasLimit: gasLimit)
                 .map { transactionInfo in
                     Data(hex: transactionInfo.hash)!
                 }

diff --git a/Erc20Kit/Erc20Kit/Core/Erc20Kit.swift b/Erc20Kit/Erc20Kit/Core/Erc20Kit.swift
@@ -4,7 +4,7 @@ import HSCryptoKit
 import BigInt
 
 public class Erc20Kit {
-    private let gasLimit = 1_000_000
+    private let gasLimit: Int
     private let disposeBag = DisposeBag()
 
     private let ethereumKit: EthereumKit
@@ -13,10 +13,11 @@ public class Erc20Kit {
 
     private let state: KitState
 
-    init(ethereumKit: EthereumKit, transactionManager: ITransactionManager, balanceManager: IBalanceManager, state: KitState = KitState()) {
+    init(ethereumKit: EthereumKit, transactionManager: ITransactionManager, balanceManager: IBalanceManager, gasLimit: Int = 1_000_000, state: KitState = KitState()) {
         self.ethereumKit = ethereumKit
         self.transactionManager = transactionManager
         self.balanceManager = balanceManager
+        self.gasLimit = gasLimit
         self.state = state
 
         onUpdateSyncState(syncState: ethereumKit.syncState)
@@ -104,15 +105,14 @@ extension Erc20Kit {
             return Single.error(ValidationError.invalidValue)
         }
 
-        var data: Data?
         do {
             let toAddress = try convert(address: to)
-            data = transactionManager.transactionContractData(to: toAddress, value: amountValue)
+            let data = transactionManager.transactionContractData(to: toAddress, value: amountValue)
+
+            return ethereumKit.estimateGas(contractAddress: contractAddress, amount: nil, gasLimit: gasLimit, data: data)
         } catch {
             return Single.error(ValidationError.invalidAddress)
         }
-
-        return ethereumKit.estimateGas(contractAddress: contractAddress, amount: nil, gasLimit: gasLimit, data: data)
     }
 
 }

diff --git a/Erc20Kit/Erc20Kit/Info.plist b/Erc20Kit/Erc20Kit/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>

diff --git a/EthereumKit.swift.podspec b/EthereumKit.swift.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |spec|
   spec.name = 'EthereumKit.swift'
   spec.module_name = 'EthereumKit'
-  spec.version = '0.6.4'
+  spec.version = '0.7.2'
   spec.summary = 'Ethereum wallet library for Swift'
   spec.description = <<-DESC
                        EthereumKit.swift implements Ethereum protocol in Swift.

diff --git a/EthereumKit/EthereumKit.xcodeproj/project.pbxproj b/EthereumKit/EthereumKit.xcodeproj/project.pbxproj
@@ -1384,6 +1384,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
+				MARKETING_VERSION = 0.7.2;
 				PRODUCT_BUNDLE_IDENTIFIER = io.horizontalsystems.EthereumKit;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -1414,6 +1415,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
+				MARKETING_VERSION = 0.7.2;
 				PRODUCT_BUNDLE_IDENTIFIER = io.horizontalsystems.EthereumKit;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;

diff --git a/EthereumKit/EthereumKit/Core/EthereumKit.swift b/EthereumKit/EthereumKit/Core/EthereumKit.swift
@@ -101,8 +101,8 @@ extension EthereumKit {
                 .map { $0.map { TransactionInfo(transaction: $0) } }
     }
 
-    public func sendSingle(to: Data, value: BigUInt, transactionInput: Data = Data(), gasPrice: Int, gasLimit: Int) -> Single<TransactionInfo> {
-        let rawTransaction = transactionBuilder.rawTransaction(gasPrice: gasPrice, gasLimit: gasLimit, to: to, value: value, data: transactionInput)
+    public func sendSingle(address: Data, value: BigUInt, transactionInput: Data = Data(), gasPrice: Int, gasLimit: Int) -> Single<TransactionInfo> {
+        let rawTransaction = transactionBuilder.rawTransaction(gasPrice: gasPrice, gasLimit: gasLimit, to: address, value: value, data: transactionInput)
 
         return blockchain.sendSingle(rawTransaction: rawTransaction)
                 .do(onSuccess: { [weak self] transaction in
@@ -111,7 +111,7 @@ extension EthereumKit {
                 .map { TransactionInfo(transaction: $0) }
     }
 
-    public func sendSingle(to: String, value: String, gasPrice: Int) -> Single<TransactionInfo> {
+    public func sendSingle(to: String, value: String, gasPrice: Int, gasLimit: Int? = nil) -> Single<TransactionInfo> {
         guard let to = Data(hex: to) else {
             return Single.error(SendError.invalidAddress)
         }
@@ -120,7 +120,7 @@ extension EthereumKit {
             return Single.error(SendError.invalidValue)
         }
 
-        return sendSingle(to: to, value: value, gasPrice: gasPrice, gasLimit: gasLimit)
+        return sendSingle(address: to, value: value, gasPrice: gasPrice, gasLimit: gasLimit ?? self.gasLimit)
     }
 
     public var debugInfo: String {

diff --git a/EthereumKit/EthereumKit/Info.plist b/EthereumKit/EthereumKit/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>

diff --git a/EthereumKitDemo/EthereumKitDemo.xcodeproj/project.pbxproj b/EthereumKitDemo/EthereumKitDemo.xcodeproj/project.pbxproj
@@ -242,6 +242,7 @@
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				en,
 				Base,
 			);
 			mainGroup = 3A3B59CD216B1D81001C5E99;
@@ -470,6 +471,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 0.7.2;
 				PRODUCT_BUNDLE_IDENTIFIER = io.horizontalsystems.EthereumKitDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -489,6 +491,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 0.7.2;
 				PRODUCT_BUNDLE_IDENTIFIER = io.horizontalsystems.EthereumKitDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;

diff --git a/EthereumKitDemo/EthereumKitDemo/Info.plist b/EthereumKitDemo/EthereumKitDemo/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>