Merge pull request #725 from JeneaVranceanu/fix/anyobject-usage-removed

fix: replaced AnyObject with Any

Author: JeneaVranceanu

Example/myWeb3Wallet/myWeb3Wallet/ViewControllers/WalletController/WalletViewController.swift

@@ -89,13 +89,13 @@ class WalletViewController: UIViewController {
                 let manager = KeystoreManager([myWeb3KeyStore])
                 let address = keystore?.addresses?.first
 #if DEBUG
-                print("Address :::>>>>> ", address as Any)
-                print("Address :::>>>>> ", manager.addresses as Any)
+                print("Address :::>>>>> ", address)
+                print("Address :::>>>>> ", manager.addresses)
 #endif
                 let walletAddress = manager.addresses?.first?.address
                 self.walletAddressLabel.text = walletAddress ?? "0x"
 
-                print(walletAddress as Any)
+                print(walletAddress)
             } else {
                 print("error")
             }
@@ -115,7 +115,7 @@ class WalletViewController: UIViewController {
     }
     func importWalletWith(mnemonics: String) {
         let walletAddress = try? BIP32Keystore(mnemonics: mnemonics , prefixPath: "m/44'/77777'/0'/0")
-        print(walletAddress?.addresses as Any)
+        print(walletAddress?.addresses)
         self.walletAddressLabel.text = "\(walletAddress?.addresses?.first?.address ?? "0x")"
 
     }
@@ -137,15 +137,15 @@ extension WalletViewController {
                 self._mnemonics = tMnemonics
                 print(_mnemonics)
                 let tempWalletAddress = try? BIP32Keystore(mnemonics: self._mnemonics , prefixPath: "m/44'/77777'/0'/0")
-                print(tempWalletAddress?.addresses?.first?.address as Any)
+                print(tempWalletAddress?.addresses?.first?.address)
                 guard let walletAddress = tempWalletAddress?.addresses?.first else {
                     self.showAlertMessage(title: "", message: "We are unable to create wallet", actionName: "Ok")
                     return
                 }
                 self._walletAddress = walletAddress.address
                 let privateKey = try tempWalletAddress?.UNSAFE_getPrivateKeyData(password: "", account: walletAddress)
 #if DEBUG
-                print(privateKey as Any, "Is the private key")
+                print(privateKey, "Is the private key")
 #endif
                 let keyData = try? JSONEncoder().encode(tempWalletAddress?.keystoreParams)
                 FileManager.default.createFile(atPath: userDir + "/keystore"+"/key.json", contents: keyData, attributes: nil)

README.md

@@ -132,7 +132,7 @@ let response = try await readTX.callContractMethod()
 let abiString = "[]" // some ABI string
 let bytecode = Data.fromHex("") // some ABI bite sequence
 let contract = web3.contract(abiString, at: nil, abiVersion: 2)!
-let parameters = [...] as [AnyObject]
+let parameters: [Any] = [...]
 let deployOp = contract.prepareDeploy(bytecode: bytecode, constructor: contract.contract.constructor, parameters: parameters)!
 deployOp.transaction.from = "" // your address
 deployOp.transaction.gasLimitPolicy = .manual(3000000)

Sources/Core/EthereumABI/ABIElements.swift

@@ -173,7 +173,7 @@ public extension ABI {
 // MARK: - Function parameters encoding
 
 extension ABI.Element {
-    public func encodeParameters(_ parameters: [AnyObject]) -> Data? {
+    public func encodeParameters(_ parameters: [Any]) -> Data? {
         switch self {
         case .constructor(let constructor):
             return constructor.encodeParameters(parameters)
@@ -192,7 +192,7 @@ extension ABI.Element {
 }
 
 extension ABI.Element.Constructor {
-    public func encodeParameters(_ parameters: [AnyObject]) -> Data? {
+    public func encodeParameters(_ parameters: [Any]) -> Data? {
         guard parameters.count == inputs.count else { return nil }
         return ABIEncoder.encode(types: inputs, values: parameters)
     }
@@ -203,7 +203,7 @@ extension ABI.Element.Function {
     /// Encode parameters of a given contract method
     /// - Parameter parameters: Parameters to pass to Ethereum contract
     /// - Returns: Encoded data 
-    public func encodeParameters(_ parameters: [AnyObject]) -> Data? {
+    public func encodeParameters(_ parameters: [Any]) -> Data? {
         guard parameters.count == inputs.count,
               let data = ABIEncoder.encode(types: inputs, values: parameters) else { return nil }
         return methodEncoding + data

Sources/Web3Core/Contract/ContractProtocol.swift

@@ -35,7 +35,7 @@ import BigInt
 /// let inputArgsTypes: [ABI.Element.InOut] = [.init(name: "firstArgument", type: ABI.Element.ParameterType.string),
 ///                                            .init(name: "secondArgument", type: ABI.Element.ParameterType.uint(bits: 256))]
 /// let constructor = ABI.Element.Constructor(inputs: inputArgsTypes, constant: false, payable: payable)
-/// let constructorArguments = ["This is the array of constructor arguments", 10_000] as [AnyObject]
+/// let constructorArguments: [Any] = ["This is the array of constructor arguments", 10_000]
 ///
 /// contract.deploy(bytecode: smartContractBytecode,
 ///                 constructor: constructor,
@@ -48,7 +48,7 @@ import BigInt
 ///
 /// ```swift
 /// let contract = EthereumContract(abiString)
-/// let constructorArguments = ["This is the array of constructor arguments", 10_000] as [AnyObject]
+/// let constructorArguments: [Any] = ["This is the array of constructor arguments", 10_000]
 ///
 /// contract.deploy(bytecode: smartContractBytecode,
 ///                 constructor: contract.constructor,
@@ -121,7 +121,7 @@ public protocol ContractProtocol {
     /// - Returns: Encoded data for a given parameters, which is should be assigned to ``CodableTransaction.data`` property
     func deploy(bytecode: Data,
                 constructor: ABI.Element.Constructor?,
-                parameters: [AnyObject]?,
+                parameters: [Any]?,
                 extraData: Data?) -> Data?
 
     /// Creates function call transaction with data set as `method` encoded with given `parameters`.
@@ -134,7 +134,7 @@ public protocol ContractProtocol {
     ///   - parameters: method input arguments;
     ///   - extraData: additional data to append at the end of `transaction.data` field;
     /// - Returns: transaction object if `method` was found and `parameters` were successfully encoded.
-    func method(_ method: String, parameters: [AnyObject], extraData: Data?) -> Data?
+    func method(_ method: String, parameters: [Any], extraData: Data?) -> Data?
 
     /// Decode output data of a function.
     /// - Parameters:
@@ -190,7 +190,7 @@ extension ContractProtocol {
     /// See ``ContractProtocol/deploy(bytecode:constructor:parameters:extraData:)`` for details.
     func deploy(_ bytecode: Data,
                 constructor: ABI.Element.Constructor? = nil,
-                parameters: [AnyObject]? = nil,
+                parameters: [Any]? = nil,
                 extraData: Data? = nil) -> Data? {
         deploy(bytecode: bytecode,
                constructor: constructor,
@@ -203,7 +203,7 @@ extension ContractProtocol {
     ///
     /// See ``ContractProtocol/method(_:parameters:extraData:)`` for details.
     func method(_ method: String = "fallback",
-                parameters: [AnyObject]? = nil,
+                parameters: [Any]? = nil,
                 extraData: Data? = nil) -> Data? {
         self.method(method, parameters: parameters ?? [], extraData: extraData)
     }
@@ -222,7 +222,7 @@ extension DefaultContractProtocol {
     // MARK: Writing Data flow
     public func deploy(bytecode: Data,
                        constructor: ABI.Element.Constructor?,
-                       parameters: [AnyObject]?,
+                       parameters: [Any]?,
                        extraData: Data?) -> Data? {
         var fullData = bytecode
 
@@ -258,7 +258,7 @@ extension DefaultContractProtocol {
     ///   - data: parameters + extraData
     ///   - params: EthereumParameters with no contract method call encoded data.
     public func method(_ method: String,
-                       parameters: [AnyObject],
+                       parameters: [Any],
                        extraData: Data?) -> Data? {
         // MARK: - Encoding ABI Data flow
         if method == "fallback" {

Sources/Web3Core/EthereumABI/ABIDecoding.swift

@@ -9,15 +9,15 @@ import BigInt
 public struct ABIDecoder { }
 
 extension ABIDecoder {
-    public static func decode(types: [ABI.Element.InOut], data: Data) -> [AnyObject]? {
+    public static func decode(types: [ABI.Element.InOut], data: Data) -> [Any]? {
         let params = types.compactMap { el -> ABI.Element.ParameterType in
             return el.type
         }
         return decode(types: params, data: data)
     }
 
-    public static func decode(types: [ABI.Element.ParameterType], data: Data) -> [AnyObject]? {
-        var toReturn = [AnyObject]()
+    public static func decode(types: [ABI.Element.ParameterType], data: Data) -> [Any]? {
+        var toReturn = [Any]()
         var consumed: UInt64 = 0
         for i in 0 ..< types.count {
             let (v, c) = decodeSingleType(type: types[i], data: data, pointer: consumed)
@@ -29,7 +29,7 @@ extension ABIDecoder {
         return toReturn
     }
 
-    public static func decodeSingleType(type: ABI.Element.ParameterType, data: Data, pointer: UInt64 = 0) -> (value: AnyObject?, bytesConsumed: UInt64?) {
+    public static func decodeSingleType(type: ABI.Element.ParameterType, data: Data, pointer: UInt64 = 0) -> (value: Any?, bytesConsumed: UInt64?) {
         let (elData, nextPtr) = followTheData(type: type, data: data, pointer: pointer)
         guard let elementItself = elData, let nextElementPointer = nextPtr else {
             return (nil, nil)
@@ -40,18 +40,18 @@ extension ABIDecoder {
             let mod = BigUInt(1) << bits
             let dataSlice = elementItself[0 ..< 32]
             let v = BigUInt(dataSlice) % mod
-            return (v as AnyObject, type.memoryUsage)
+            return (v, type.memoryUsage)
         case .int(let bits):
             guard elementItself.count >= 32 else {break}
             let mod = BigInt(1) << bits
             let dataSlice = elementItself[0 ..< 32]
             let v = BigInt.fromTwosComplement(data: dataSlice) % mod
-            return (v as AnyObject, type.memoryUsage)
+            return (v, type.memoryUsage)
         case .address:
             guard elementItself.count >= 32 else {break}
             let dataSlice = elementItself[12 ..< 32]
             let address = EthereumAddress(dataSlice)
-            return (address as AnyObject, type.memoryUsage)
+            return (address, type.memoryUsage)
         case .bool:
             guard elementItself.count >= 32 else {break}
             let dataSlice = elementItself[0 ..< 32]
@@ -60,32 +60,32 @@ extension ABIDecoder {
                 v == BigUInt(32) ||
                 v == BigUInt(28) ||
                 v == BigUInt(1) {
-                return (true as AnyObject, type.memoryUsage)
+                return (true, type.memoryUsage)
             } else if v == BigUInt(35) ||
                 v == BigUInt(31) ||
                 v == BigUInt(27) ||
                 v == BigUInt(0) {
-                return (false as AnyObject, type.memoryUsage)
+                return (false, type.memoryUsage)
             }
         case .bytes(let length):
             guard elementItself.count >= 32 else {break}
             let dataSlice = elementItself[0 ..< length]
-            return (dataSlice as AnyObject, type.memoryUsage)
+            return (dataSlice, type.memoryUsage)
         case .string:
             guard elementItself.count >= 32 else {break}
             var dataSlice = elementItself[0 ..< 32]
             let length = UInt64(BigUInt(dataSlice))
             guard elementItself.count >= 32+length else {break}
             dataSlice = elementItself[32 ..< 32 + length]
             guard let string = String(data: dataSlice, encoding: .utf8) else {break}
-            return (string as AnyObject, type.memoryUsage)
+            return (string, type.memoryUsage)
         case .dynamicBytes:
             guard elementItself.count >= 32 else {break}
             var dataSlice = elementItself[0 ..< 32]
             let length = UInt64(BigUInt(dataSlice))
             guard elementItself.count >= 32+length else {break}
             dataSlice = elementItself[32 ..< 32 + length]
-            return (dataSlice as AnyObject, nextElementPointer)
+            return (dataSlice, nextElementPointer)
         case .array(type: let subType, length: let length):
             switch type.arraySize {
             case .dynamicSize:
@@ -97,14 +97,14 @@ extension ABIDecoder {
                     guard elementItself.count >= 32 + subType.memoryUsage*length else {break}
                     dataSlice = elementItself[32 ..< 32 + subType.memoryUsage*length]
                     var subpointer: UInt64 = 32
-                    var toReturn = [AnyObject]()
+                    var toReturn = [Any]()
                     for _ in 0 ..< length {
                         let (v, c) = decodeSingleType(type: subType, data: elementItself, pointer: subpointer)
                         guard let valueUnwrapped = v, let consumedUnwrapped = c else {break}
                         toReturn.append(valueUnwrapped)
                         subpointer = subpointer + consumedUnwrapped
                     }
-                    return (toReturn as AnyObject, type.memoryUsage)
+                    return (toReturn, type.memoryUsage)
                 } else {
                     // in principle is true for tuple[], so will work for string[] too
                     guard elementItself.count >= 32 else {break}
@@ -113,7 +113,7 @@ extension ABIDecoder {
                     guard elementItself.count >= 32 else {break}
                     dataSlice = Data(elementItself[32 ..< elementItself.count])
                     var subpointer: UInt64 = 0
-                    var toReturn = [AnyObject]()
+                    var toReturn = [Any]()
                     for _ in 0 ..< length {
                         let (v, c) = decodeSingleType(type: subType, data: dataSlice, pointer: subpointer)
                         guard let valueUnwrapped = v, let consumedUnwrapped = c else {break}
@@ -124,11 +124,11 @@ extension ABIDecoder {
                             subpointer = consumedUnwrapped // need to go by nextElementPointer
                         }
                     }
-                    return (toReturn as AnyObject, nextElementPointer)
+                    return (toReturn, nextElementPointer)
                 }
             case .staticSize(let staticLength):
                 guard length == staticLength else {break}
-                var toReturn = [AnyObject]()
+                var toReturn = [Any]()
                 var consumed: UInt64 = 0
                 for _ in 0 ..< length {
                     let (v, c) = decodeSingleType(type: subType, data: elementItself, pointer: consumed)
@@ -137,15 +137,15 @@ extension ABIDecoder {
                     consumed = consumed + consumedUnwrapped
                 }
                 if subType.isStatic {
-                    return (toReturn as AnyObject, consumed)
+                    return (toReturn, consumed)
                 } else {
-                    return (toReturn as AnyObject, nextElementPointer)
+                    return (toReturn, nextElementPointer)
                 }
             case .notArray:
                 break
             }
         case .tuple(types: let subTypes):
-            var toReturn = [AnyObject]()
+            var toReturn = [Any]()
             var consumed: UInt64 = 0
             for i in 0 ..< subTypes.count {
                 let (v, c) = decodeSingleType(type: subTypes[i], data: elementItself, pointer: consumed)
@@ -173,14 +173,14 @@ extension ABIDecoder {
                 }
             }
             if type.isStatic {
-                return (toReturn as AnyObject, consumed)
+                return (toReturn, consumed)
             } else {
-                return (toReturn as AnyObject, nextElementPointer)
+                return (toReturn, nextElementPointer)
             }
         case .function:
             guard elementItself.count >= 32 else {break}
             let dataSlice = elementItself[8 ..< 32]
-            return (dataSlice as AnyObject, type.memoryUsage)
+            return (dataSlice, type.memoryUsage)
         }
         return (nil, nil)
     }
@@ -236,7 +236,7 @@ extension ABIDecoder {
             return inp.type
         }
         guard logs.count == indexedInputs.count + 1 else {return nil}
-        var indexedValues = [AnyObject]()
+        var indexedValues = [Any]()
         for i in 0 ..< indexedInputs.count {
             let data = logs[i+1]
             let input = indexedInputs[i]

Sources/Web3Core/EthereumABI/ABIElements.swift

@@ -174,7 +174,7 @@ public extension ABI {
 // MARK: - Function parameters encoding
 
 extension ABI.Element {
-    public func encodeParameters(_ parameters: [AnyObject]) -> Data? {
+    public func encodeParameters(_ parameters: [Any]) -> Data? {
         switch self {
         case .constructor(let constructor):
             return constructor.encodeParameters(parameters)
@@ -193,7 +193,7 @@ extension ABI.Element {
 }
 
 extension ABI.Element.Constructor {
-    public func encodeParameters(_ parameters: [AnyObject]) -> Data? {
+    public func encodeParameters(_ parameters: [Any]) -> Data? {
         guard parameters.count == inputs.count else { return nil }
         return ABIEncoder.encode(types: inputs, values: parameters)
     }
@@ -204,7 +204,7 @@ extension ABI.Element.Function {
     /// Encode parameters of a given contract method
     /// - Parameter parameters: Parameters to pass to Ethereum contract
     /// - Returns: Encoded data
-    public func encodeParameters(_ parameters: [AnyObject]) -> Data? {
+    public func encodeParameters(_ parameters: [Any]) -> Data? {
         guard parameters.count == inputs.count,
               let data = ABIEncoder.encode(types: inputs, values: parameters) else { return nil }
         return methodEncoding + data