correctly fixed and added erc20, 165, 721, 777, 820

Author: TonioMacaronio

web3swift.xcodeproj/project.pbxproj

@@ -211,6 +211,8 @@
 		E228BED121A4C89F0085268C /* Web3Legacy+Instance.swift in Sources */ = {isa = PBXBuildFile; fileRef = E228BECA21A4C89F0085268C /* Web3Legacy+Instance.swift */; };
 		E228BED221A4C89F0085268C /* Web3Legacy+Instance.swift in Sources */ = {isa = PBXBuildFile; fileRef = E228BECA21A4C89F0085268C /* Web3Legacy+Instance.swift */; };
 		E279C9EF21C46A140081695F /* Web3+ERC165.swift in Sources */ = {isa = PBXBuildFile; fileRef = E279C9EE21C46A140081695F /* Web3+ERC165.swift */; };
+		E279C9F521C47B4A0081695F /* Web3+ERC777.swift in Sources */ = {isa = PBXBuildFile; fileRef = E279C9F421C47B4A0081695F /* Web3+ERC777.swift */; };
+		E279C9F821C47CD00081695F /* Web3+ERC820.swift in Sources */ = {isa = PBXBuildFile; fileRef = E279C9F721C47CD00081695F /* Web3+ERC820.swift */; };
 		E2DCA653218C875100F94FBA /* web3swift_ENS_Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81A7B2782143C978004CD2C7 /* web3swift_ENS_Tests.swift */; };
 		E2DCA654218C879900F94FBA /* ENS.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2E668CD214F8A7B00C3CC2D /* ENS.swift */; };
 		E2DCA655218C879900F94FBA /* ENSResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = B219DC162154F3EE0035BF94 /* ENSResolver.swift */; };
@@ -392,6 +394,8 @@
 		E23B5AE020EA695400DC7F32 /* web3swift_rinkeby_personalSignature_Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = web3swift_rinkeby_personalSignature_Tests.swift; sourceTree = "<group>"; };
 		E23B5AE220EA69B900DC7F32 /* web3swift_numberFormattingUtil_Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = web3swift_numberFormattingUtil_Tests.swift; sourceTree = "<group>"; };
 		E279C9EE21C46A140081695F /* Web3+ERC165.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Web3+ERC165.swift"; sourceTree = "<group>"; };
+		E279C9F421C47B4A0081695F /* Web3+ERC777.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Web3+ERC777.swift"; sourceTree = "<group>"; };
+		E279C9F721C47CD00081695F /* Web3+ERC820.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Web3+ERC820.swift"; sourceTree = "<group>"; };
 		E2C590752152835400FF53D3 /* JSONRPCrequestDispatcher+ObjC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "JSONRPCrequestDispatcher+ObjC.swift"; sourceTree = "<group>"; };
 		E2E94C5F217788E0005F54A0 /* Web3+ERC721.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Web3+ERC721.swift"; sourceTree = "<group>"; };
 		FB43EC035C593F9E5A3644B6 /* Pods-web3swift-macOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-web3swift-macOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-web3swift-macOS/Pods-web3swift-macOS.debug.xcconfig"; sourceTree = "<group>"; };
@@ -612,6 +616,8 @@
 		8159C50921343EF900197B91 /* PrecompiledContracts */ = {
 			isa = PBXGroup;
 			children = (
+				E279C9F621C47CC10081695F /* ERC820 */,
+				E279C9F321C47B3B0081695F /* ERC777 */,
 				E279C9ED21C3F2970081695F /* ERC165 */,
 				E2E94C5E2177886C005F54A0 /* ERC721 */,
 				8159C50621343ED300197B91 /* ERC20 */,
@@ -956,6 +962,22 @@
 			path = ERC165;
 			sourceTree = "<group>";
 		};
+		E279C9F321C47B3B0081695F /* ERC777 */ = {
+			isa = PBXGroup;
+			children = (
+				E279C9F421C47B4A0081695F /* Web3+ERC777.swift */,
+			);
+			path = ERC777;
+			sourceTree = "<group>";
+		};
+		E279C9F621C47CC10081695F /* ERC820 */ = {
+			isa = PBXGroup;
+			children = (
+				E279C9F721C47CD00081695F /* Web3+ERC820.swift */,
+			);
+			path = ERC820;
+			sourceTree = "<group>";
+		};
 		E2E94C5E2177886C005F54A0 /* ERC721 */ = {
 			isa = PBXGroup;
 			children = (
@@ -1259,6 +1281,7 @@
 				81FB21FE207BB297007F9A83 /* EIP67Code.swift in Sources */,
 				81A1821A20D5A6F70016741F /* Promise+HttpProvider.swift in Sources */,
 				E228BECD21A4C89F0085268C /* Web3Legacy+Contract.swift in Sources */,
+				E279C9F821C47CD00081695F /* Web3+ERC820.swift in Sources */,
 				81A1823720D6E2BB0016741F /* Promise+Web3+Eth+GetBlockByHash.swift in Sources */,
 				81909D51218DAEC0007D2AE5 /* Promise+Web3+Personal+CreateAccount.swift in Sources */,
 				818D16CF204D42910084D2A4 /* Web3+EventParser.swift in Sources */,
@@ -1307,6 +1330,7 @@
 				81C0FCF220440EB500D82FAF /* Web3+Protocols.swift in Sources */,
 				81C0FCF420440F0900D82FAF /* Web3+Options.swift in Sources */,
 				81A1822E20D67BC30016741F /* Promise+Web3+Eth+GetTransactionReceipt.swift in Sources */,
+				E279C9F521C47B4A0081695F /* Web3+ERC777.swift in Sources */,
 				81A1824020D79FDB0016741F /* Promise+Web3+Eth+EstimateGas.swift in Sources */,
 				81909D1221862D17007D2AE5 /* Web3+ReadingTransaction.swift in Sources */,
 				81A1822B20D67A1B0016741F /* Promise+Web3+Eth+GetTransactionDetails.swift in Sources */,

web3swift/PrecompiledContracts/ERC165/Web3+ERC165.swift

@@ -7,9 +7,6 @@
 //
 
 import Foundation
-import BigInt
-import PromiseKit
-import EthereumAddress
 
 protocol IERC165 {
 

web3swift/PrecompiledContracts/ERC20/Web3+ERC20.swift

@@ -29,6 +29,7 @@ public class ERC20: IERC20 {
     private var _name: String? = nil
     private var _symbol: String? = nil
     private var _decimals: UInt8? = nil
+    private var _totalSupply: BigUInt? = nil
     private var _hasReadProperties: Bool = false
 
     public var transactionOptions: TransactionOptions
@@ -75,6 +76,14 @@ public class ERC20: IERC20 {
         return 255
     }
 
+    public var totalSupply: BigUInt {
+        self.readProperties()
+        if self._totalSupply != nil {
+            return self._totalSupply!
+        }
+        return 0
+    }
+    
     public func readProperties() {
         if self._hasReadProperties {
             return
@@ -88,8 +97,10 @@ public class ERC20: IERC20 {
         guard let symbolPromise = contract.read("symbol", parameters: [] as [AnyObject], extraData: Data(), transactionOptions: transactionOptions)?.callPromise() else {return}
 
         guard let decimalPromise = contract.read("decimals", parameters: [] as [AnyObject], extraData: Data(), transactionOptions: transactionOptions)?.callPromise() else {return}
+        
+        guard let totalSupplyPromise = contract.read("totalSupply", parameters: [] as [AnyObject], extraData: Data(), transactionOptions: transactionOptions)?.callPromise() else {return}
 
-        let allPromises = [namePromise, symbolPromise, decimalPromise]
+        let allPromises = [namePromise, symbolPromise, decimalPromise, totalSupplyPromise]
         let queue = self.web3.requestDispatcher.queue
         when(resolved: allPromises).map(on: queue) { (resolvedPromises) -> Void in
             guard case .fulfilled(let nameResult) = resolvedPromises[0] else {return}
@@ -104,6 +115,10 @@ public class ERC20: IERC20 {
             guard let decimals = decimalsResult["0"] as? BigUInt else {return}
             self._decimals = UInt8(decimals)
 
+            guard case .fulfilled(let totalSupplyResult) = resolvedPromises[3] else {return}
+            guard let totalSupply = totalSupplyResult["0"] as? BigUInt else {return}
+            self._totalSupply = totalSupply
+            
             self._hasReadProperties = true
         }.wait()
     }