fix

Author: zkToha

Sources/web3swift/Convenience/SECP256k1.swift

@@ -184,6 +184,8 @@ extension SECP256K1 {
             v -= 27
         } else if v >= 31 && v <= 34 {
             v -= 31
+        } else if v >= 35 && v <= 38 {
+            v -= 35
         }
         let result = serializedSignature.withUnsafeBytes { (serRawBufferPtr: UnsafeRawBufferPointer) -> Int32? in
             if let serRawPtr = serRawBufferPtr.baseAddress, serRawBufferPtr.count > 0 {
@@ -221,9 +223,9 @@ extension SECP256K1 {
         guard let res = result, res != 0 else {
             return nil
         }
-        if (v == 0) {
+        if (v == 0 || v == 27 || v == 31 || v == 35) {
             serializedSignature.append(0x1b)
-        } else if (v == 1) {
+        } else if (v == 1 || v == 28 || v == 32 || v == 36) {
             serializedSignature.append(0x1c)
         } else {
             return nil

Sources/web3swift/EthereumABI/ABIDecoding.swift

@@ -67,13 +67,15 @@ extension ABIDecoder {
             let dataSlice = elementItself[0 ..< 32]
             let v = BigUInt(dataSlice)
             //            print("Address element is: \n" + String(v))
-            if v == BigUInt(28) {
+            if v == BigUInt(36) ||
+                v == BigUInt(32) ||
+                v == BigUInt(28) ||
+                v == BigUInt(1) {
                 return (true as AnyObject, type.memoryUsage)
-            } else if (v == BigUInt(27)) {
-                return (false as AnyObject, type.memoryUsage)
-            } else if (v == BigUInt(1)) {
-                return (true as AnyObject, type.memoryUsage)
-            } else if (v == BigUInt(0)) {
+            } else if v == BigUInt(35) ||
+                v == BigUInt(31) ||
+                v == BigUInt(27) ||
+                v == BigUInt(0) {
                 return (false as AnyObject, type.memoryUsage)
             }
         case .bytes(let length):

Sources/web3swift/HookedFunctions/Web3+BrowserFunctions.swift

@@ -63,6 +63,8 @@ extension web3.BrowserFunctions {
             vData -= 27
         } else if vData >= 31 && vData <= 34 {
             vData -= 31
+        } else if vData >= 35 && vData <= 38 {
+            vData -= 35
         }
         guard let signatureData = SECP256K1.marshalSignature(v: vData, r: rData, s: sData) else {return nil}
         guard let hash = Web3.Utils.hashPersonalMessage(personalMessage) else {return nil}

Sources/web3swift/Transaction/EthereumTransaction.swift

@@ -115,17 +115,19 @@ public struct EthereumTransaction: CustomStringConvertible {
         var normalizedV:BigUInt = BigUInt(27)
         let inferedChainID = self.inferedChainID
         var d = BigUInt(0)
-        if self.v >= 39 {
+        if self.v >= 35 && self.v <= 38 {
             d = BigUInt(35)
-        } else if self.v >= 35 && self.v <= 38 {
-            d = BigUInt(8)
+        } else if self.v >= 31 && self.v <= 34 {
+            d = BigUInt(31)
+        } else if self.v >= 27 && self.v <= 30 {
+            d = BigUInt(27)
         }
         if (self.chainID != nil && self.chainID != BigUInt(0)) {
             normalizedV = self.v - d - self.chainID! - self.chainID!
         } else if (inferedChainID != nil) {
             normalizedV = self.v - d - inferedChainID! - inferedChainID!
         } else {
-            normalizedV = self.v
+            normalizedV = self.v - d
         }
         guard let vData = normalizedV.serialize().setLengthLeft(1) else {return nil}
         guard let rData = r.serialize().setLengthLeft(32) else {return nil}

Sources/web3swift/Transaction/TransactionSigner.swift

@@ -92,12 +92,15 @@ public struct Web3Signer {
             let originalPublicKey = SECP256K1.privateToPublic(privateKey: privateKey)
             transaction.chainID = nil
             var d = BigUInt(0)
+            var a = BigUInt(0)
             if unmarshalledSignature.v >= 0 && unmarshalledSignature.v <= 3 {
                 d = BigUInt(27)
-            } else if unmarshalledSignature.v >= 27 && unmarshalledSignature.v <= 30 {
-                d = BigUInt(0)
+            } else if unmarshalledSignature.v >= 31 && unmarshalledSignature.v <= 34 {
+                a = BigUInt(4)
+            } else if unmarshalledSignature.v >= 35 && unmarshalledSignature.v <= 38 {
+                a = BigUInt(8)
             }
-            transaction.v = BigUInt(unmarshalledSignature.v) + d
+            transaction.v = BigUInt(unmarshalledSignature.v) + d - a
             transaction.r = BigUInt(Data(unmarshalledSignature.r))
             transaction.s = BigUInt(Data(unmarshalledSignature.s))
             let recoveredPublicKey = transaction.recoverPublicKey()

Sources/web3swift/Web3/Web3+Utils.swift

@@ -6118,6 +6118,8 @@ extension Web3.Utils {
             vData -= 27
         } else if vData >= 31 && vData <= 34 {
             vData -= 31
+        } else if vData >= 35 && vData <= 38 {
+            vData -= 35
         }
 
         guard let signatureData = SECP256K1.marshalSignature(v: vData, r: rData, s: sData) else {return nil}
@@ -6140,6 +6142,8 @@ extension Web3.Utils {
             vData -= 27
         } else if vData >= 31 && vData <= 34 {
             vData -= 31
+        } else if vData >= 35 && vData <= 38 {
+            vData -= 35
         }
         guard let signatureData = SECP256K1.marshalSignature(v: vData, r: rData, s: sData) else {return nil}
         guard let publicKey = SECP256K1.recoverPublicKey(hash: hash, signature: signatureData) else {return nil}