- Add extra hook function

- Fix ENS
- Implement nonce middleware, example is in tests

.gitignore

@@ -67,3 +67,4 @@ fastlane/screenshots
 fastlane/test_output
 API_keys.plist
 web3swiftTests/key.json
+web3swiftTests/Resources/key.json

web3swift.xcodeproj/project.pbxproj

@@ -165,6 +165,8 @@
 		81DFB400210775320011DC85 /* Web3+Infura.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81DFB3FE210775320011DC85 /* Web3+Infura.swift */; };
 		81EB1E4B208173D7003BD47F /* Web3+Personal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81EB1E4A208173D7003BD47F /* Web3+Personal.swift */; };
 		81EB1E4C208173D7003BD47F /* Web3+Personal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81EB1E4A208173D7003BD47F /* Web3+Personal.swift */; };
+		81ED4EA82190D922003E932E /* NonceMiddleware.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81ED4EA72190D922003E932E /* NonceMiddleware.swift */; };
+		81ED4EA92190D922003E932E /* NonceMiddleware.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81ED4EA72190D922003E932E /* NonceMiddleware.swift */; };
 		81FA43F62044097100EE14D5 /* web3swift_macOS_Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81FA43F52044097100EE14D5 /* web3swift_macOS_Tests.swift */; };
 		81FA43F82044097100EE14D5 /* web3swift_macOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 417715D420362916005C3E16 /* web3swift_macOS.framework */; };
 		81FB21FE207BB297007F9A83 /* EIP67Code.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81FB21F8207BA78B007F9A83 /* EIP67Code.swift */; };
@@ -310,6 +312,7 @@
 		81DDECCE1FDF004E0063684A /* Web3.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Web3.swift; sourceTree = "<group>"; };
 		81DFB3FE210775320011DC85 /* Web3+Infura.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Web3+Infura.swift"; sourceTree = "<group>"; };
 		81EB1E4A208173D7003BD47F /* Web3+Personal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Web3+Personal.swift"; sourceTree = "<group>"; };
+		81ED4EA72190D922003E932E /* NonceMiddleware.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NonceMiddleware.swift; sourceTree = "<group>"; };
 		81FA43F32044097000EE14D5 /* web3swift-macOS_Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "web3swift-macOS_Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		81FA43F52044097100EE14D5 /* web3swift_macOS_Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = web3swift_macOS_Tests.swift; sourceTree = "<group>"; };
 		81FA43F72044097100EE14D5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -502,6 +505,7 @@
 				81A7B2862143DBF6004CD2C7 /* EIP681.swift */,
 				B2E668CD214F8A7B00C3CC2D /* ENS.swift */,
 				B219DC162154F3EE0035BF94 /* ENSResolver.swift */,
+				81ED4EA72190D922003E932E /* NonceMiddleware.swift */,
 			);
 			path = Classes;
 			sourceTree = "<group>";
@@ -1054,6 +1058,7 @@
 				8160E5CE20B8245A0070070B /* IBAN.swift in Sources */,
 				81909D1521862D37007D2AE5 /* Web3+MutatingTransaction.swift in Sources */,
 				810B0F9C1FEC520500CF0DA2 /* Web3+Methods.swift in Sources */,
+				81ED4EA82190D922003E932E /* NonceMiddleware.swift in Sources */,
 				81A1822520D678590016741F /* Promise+Web3+Eth+GetGasPrice.swift in Sources */,
 				8113DE7C1FD8514400CD8DF1 /* NSRegularExpressionExtension.swift in Sources */,
 				81C5DA2E2074EBF500424CD6 /* EthereumContract.swift in Sources */,
@@ -1158,6 +1163,7 @@
 				41948131203630530065A83B /* BIP32KeystoreJSONStructure.swift in Sources */,
 				41948132203630530065A83B /* BIP32HDNode.swift in Sources */,
 				81A7B2522143C3A8004CD2C7 /* NameHash.swift in Sources */,
+				81ED4EA92190D922003E932E /* NonceMiddleware.swift in Sources */,
 				81A1824920D7DDA20016741F /* Promise+Web3+Personal+Sign.swift in Sources */,
 				81A1822620D678590016741F /* Promise+Web3+Eth+GetGasPrice.swift in Sources */,
 				81909D1621862D37007D2AE5 /* Web3+MutatingTransaction.swift in Sources */,

web3swift/Convenience/Classes/Data+Extension.swift

@@ -37,7 +37,8 @@ public extension Data {
             dataPtr.initialize(repeating: 0, count: count)
         }
     }
-    public static func randomBytes(length: Int) -> Data? {
+
+    static func randomBytes(length: Int) -> Data? {
         for _ in 0...1024 {
             var data = Data(repeating: 0, count: length)
             let result = data.withUnsafeMutableBytes {
@@ -51,7 +52,7 @@ public extension Data {
         return nil
     }
 
-    public static func fromHex(_ hex: String) -> Data? {
+    static func fromHex(_ hex: String) -> Data? {
         let string = hex.lowercased().stripHexPrefix()
         let array = Array<UInt8>(hex: string)
         if (array.count == 0) {

web3swift/Promises/Classes/Promise+Web3+Eth+SendRawTransaction.swift

@@ -33,6 +33,11 @@ extension web3.Eth {
                     throw Web3Error.nodeError(desc: "Invalid value from Ethereum node")
                 }
                 let result = TransactionSendingResult(transaction: transaction, hash: value)
+                for hook in self.web3.postSubmissionHooks {
+                    hook.queue.async {
+                        hook.function(result)
+                    }
+                }
                 return result
             }
         } catch {

web3swift/Promises/Classes/Promise+Web3+Eth+SendTransaction.swift

@@ -10,7 +10,7 @@ import PromiseKit
 
 extension web3.Eth {
 
-    public func sendTransactionPromise(_ transaction: EthereumTransaction, transactionOptions: TransactionOptions?, password:String = "web3swift") -> Promise<TransactionSendingResult> {
+    public func sendTransactionPromise(_ transaction: EthereumTransaction, transactionOptions: TransactionOptions? = nil, password:String = "web3swift") -> Promise<TransactionSendingResult> {
 //        print(transaction)
         var assembledTransaction : EthereumTransaction = transaction // .mergedWithOptions(transactionOptions)
         let queue = web3.requestDispatcher.queue
@@ -30,7 +30,7 @@ extension web3.Eth {
                     }
                 }
                 let shouldContinue = try prom.wait()
-                if shouldContinue {
+                if !shouldContinue {
                     throw Web3Error.processingError(desc: "Transaction is canceled by middleware")
                 }
             }
@@ -51,6 +51,11 @@ extension web3.Eth {
                         throw Web3Error.nodeError(desc: "Invalid value from Ethereum node")
                     }
                     let result = TransactionSendingResult(transaction: assembledTransaction, hash: value)
+                    for hook in self.web3.postSubmissionHooks {
+                        hook.queue.async {
+                            hook.function(result)
+                        }
+                    }
                     return result
                 }
             }