Merge pull request #168 from BANKEX/develop

By default use deterministic signatures now Set V value to the range 0...4 in the library itself instead of in transaction signer Mark few functions as public

Author: shamatar

web3swift/Convenience/Classes/LibSecp256k1Extension.swift

@@ -19,7 +19,7 @@ public struct SECP256K1 {
 extension SECP256K1 {
     static var context = secp256k1_context_create(UInt32(SECP256K1_CONTEXT_SIGN|SECP256K1_CONTEXT_VERIFY))
 
-    static func signForRecovery(hash: Data, privateKey: Data, useExtraEntropy: Bool = true) -> (serializedSignature:Data?, rawSignature: Data?) {
+    static func signForRecovery(hash: Data, privateKey: Data, useExtraEntropy: Bool = false) -> (serializedSignature:Data?, rawSignature: Data?) {
         if (hash.count != 32 || privateKey.count != 32) {return (nil, nil)}
         if !SECP256K1.verifyPrivateKey(privateKey: privateKey) {
             return (nil, nil)
@@ -266,7 +266,14 @@ extension SECP256K1 {
         let bytes = signatureData.bytes
         let r = Array(bytes[0..<32])
         let s = Array(bytes[32..<64])
-        return UnmarshaledSignature(v: bytes[64], r: r, s: s)
+        var v = bytes[64]
+        if v >= 27 {
+            v = v - 27
+        }
+        if v > 4 {
+            return nil
+        }
+        return UnmarshaledSignature(v: v, r: r, s: s)
     }
 
     static func marshalSignature(v: UInt8, r: [UInt8], s: [UInt8]) -> Data? {

web3swift/Transaction/Classes/TransactionSigner.swift

@@ -15,7 +15,7 @@ public enum TransactionSignerError: Error {
 }
 
 public struct Web3Signer {
-    public static func signTX(transaction:inout EthereumTransaction, keystore: AbstractKeystore, account: EthereumAddress, password: String, useExtraEntropy: Bool = true) throws {
+    public static func signTX(transaction:inout EthereumTransaction, keystore: AbstractKeystore, account: EthereumAddress, password: String, useExtraEntropy: Bool = false) throws {
         var privateKey = try keystore.UNSAFE_getPrivateKeyData(password: password, account: account)
         defer {Data.zero(&privateKey)}
         if (transaction.chainID != nil) {
@@ -24,12 +24,12 @@ public struct Web3Signer {
             try FallbackSigner.sign(transaction: &transaction, privateKey: privateKey, useExtraEntropy: useExtraEntropy)
         }
     }
-    public static func signIntermediate(intermediate:inout TransactionIntermediate, keystore: AbstractKeystore, account: EthereumAddress, password: String, useExtraEntropy: Bool = true) throws {
+    public static func signIntermediate(intermediate:inout TransactionIntermediate, keystore: AbstractKeystore, account: EthereumAddress, password: String, useExtraEntropy: Bool = false) throws {
         var tx = intermediate.transaction
         try Web3Signer.signTX(transaction: &tx, keystore: keystore, account: account, password: password, useExtraEntropy: useExtraEntropy)
         intermediate.transaction = tx
     }
-    public static func signPersonalMessage(_ personalMessage: Data, keystore: AbstractKeystore, account: EthereumAddress, password: String, useExtraEntropy: Bool = true) throws -> Data? {
+    public static func signPersonalMessage(_ personalMessage: Data, keystore: AbstractKeystore, account: EthereumAddress, password: String, useExtraEntropy: Bool = false) throws -> Data? {
         var privateKey = try keystore.UNSAFE_getPrivateKeyData(password: password, account: account)
         defer {Data.zero(&privateKey)}
         guard let hash = Web3.Utils.hashPersonalMessage(personalMessage) else {return nil}
@@ -38,7 +38,7 @@ public struct Web3Signer {
     }
 
     public struct EIP155Signer {
-        public static func sign(transaction:inout EthereumTransaction, privateKey: Data, useExtraEntropy: Bool = true) throws {
+        public static func sign(transaction:inout EthereumTransaction, privateKey: Data, useExtraEntropy: Bool = false) throws {
             for _ in 0..<1024 {
                 let result = self.attemptSignature(transaction: &transaction, privateKey: privateKey, useExtraEntropy: useExtraEntropy)
                 if (result) {
@@ -48,7 +48,7 @@ public struct Web3Signer {
             throw AbstractKeystoreError.invalidAccountError
         }
 
-        private static func attemptSignature(transaction:inout EthereumTransaction, privateKey: Data, useExtraEntropy: Bool = true) -> Bool {
+        private static func attemptSignature(transaction:inout EthereumTransaction, privateKey: Data, useExtraEntropy: Bool = false) -> Bool {
             guard let chainID = transaction.chainID else {return false}
             guard let hash = transaction.hashForSignature(chainID: chainID) else {return false}
             let signature  = SECP256K1.signForRecovery(hash: hash, privateKey: privateKey, useExtraEntropy: useExtraEntropy)
@@ -69,7 +69,7 @@ public struct Web3Signer {
     }
 
     public struct FallbackSigner {
-        public static func sign(transaction:inout EthereumTransaction, privateKey: Data, useExtraEntropy: Bool = true) throws {
+        public static func sign(transaction:inout EthereumTransaction, privateKey: Data, useExtraEntropy: Bool = false) throws {
             for _ in 0..<1024 {
                 let result = self.attemptSignature(transaction: &transaction, privateKey: privateKey)
                 if (result) {
@@ -79,7 +79,7 @@ public struct Web3Signer {
             throw AbstractKeystoreError.invalidAccountError
         }
 
-        private static func attemptSignature(transaction:inout EthereumTransaction, privateKey: Data, useExtraEntropy: Bool = true) -> Bool {
+        private static func attemptSignature(transaction:inout EthereumTransaction, privateKey: Data, useExtraEntropy: Bool = false) -> Bool {
             guard let hash = transaction.hashForSignature(chainID: nil) else {return false}
             let signature  = SECP256K1.signForRecovery(hash: hash, privateKey: privateKey, useExtraEntropy: useExtraEntropy)
             guard let serializedSignature = signature.serializedSignature else {return false}

web3swift/Web3/Classes/Web3+Eth.swift

@@ -20,7 +20,7 @@ extension web3.Eth {
         self.web3.queue.addOperation(operation)
     }
 
-    func sendTransaction(_ transaction: EthereumTransaction, options: Web3Options, password:String = "BANKEXFOUNDATION") -> Result<TransactionSendingResult, Web3Error> {
+    public func sendTransaction(_ transaction: EthereumTransaction, options: Web3Options, password:String = "BANKEXFOUNDATION") -> Result<TransactionSendingResult, Web3Error> {
         do {
             let result = try self.sendTransactionPromise(transaction, options: options, password: password).wait()
             return Result(result)
@@ -154,14 +154,14 @@ extension web3.Eth {
 //    }
 
     @available(*, deprecated)
-    func sendRawTransaction(_ transaction: EthereumTransaction, callback: @escaping Callback, queue: OperationQueue = OperationQueue.main) {
+    public func sendRawTransaction(_ transaction: EthereumTransaction, callback: @escaping Callback, queue: OperationQueue = OperationQueue.main) {
         print(transaction)
         let operation = SendRawTransactionOperation.init(self.web3, queue: self.web3.queue, transaction: transaction)
         operation.next = OperationChainingType.callback(callback, queue)
         self.web3.queue.addOperation(operation)
     }
 
-    func sendRawTransaction(_ transaction: Data) -> Result<TransactionSendingResult, Web3Error> {
+    public func sendRawTransaction(_ transaction: Data) -> Result<TransactionSendingResult, Web3Error> {
         do {
             let result = try self.sendRawTransactionPromise(transaction).wait()
             return Result(result)
@@ -173,7 +173,7 @@ extension web3.Eth {
         }
     }
 
-    func sendRawTransaction(_ transaction: EthereumTransaction) -> Result<TransactionSendingResult, Web3Error> {
+    public func sendRawTransaction(_ transaction: EthereumTransaction) -> Result<TransactionSendingResult, Web3Error> {
         do {
             let result = try self.sendRawTransactionPromise(transaction).wait()
             return Result(result)