Add todos to fix non throwing contract

janndriessen · janndriessen · commit 2f1b5e352a56 · 2022-11-22T11:59:57.000+01:00
diff --git a/Sources/web3swift/Tokens/ERC1376/Web3+ERC1376.swift b/Sources/web3swift/Tokens/ERC1376/Web3+ERC1376.swift
@@ -83,7 +83,7 @@ public class ERC1376: IERC1376, ERC20BaseProperties {
         self.transaction = transaction
         self.transaction.to = address
         self.abi = abi
-        // Forced because this should fail if contract is wrongly configured
+        // TODO: Make `init` and `web3.contract.init` throwing. Forced because this should fail if ABI is wrongly configured
         contract = web3.contract(abi, at: address)!
         basePropertiesProvider = ERC20BasePropertiesProvider(contract: contract)
     }
diff --git a/Sources/web3swift/Tokens/ERC1400/Web3+ERC1400.swift b/Sources/web3swift/Tokens/ERC1400/Web3+ERC1400.swift
@@ -80,7 +80,7 @@ public class ERC1400: IERC1400, ERC20BaseProperties {
         self.transaction = transaction
         self.transaction.to = address
         self.abi = abi
-        // Forced because this should fail if contract is wrongly configured
+        // TODO: Make `init` and `web3.contract.init` throwing. Forced because this should fail if ABI is wrongly configured
         contract = web3.contract(abi, at: address)!
         basePropertiesProvider = ERC20BasePropertiesProvider(contract: contract)
     }
diff --git a/Sources/web3swift/Tokens/ERC1410/Web3+ERC1410.swift b/Sources/web3swift/Tokens/ERC1410/Web3+ERC1410.swift
@@ -58,7 +58,7 @@ public class ERC1410: IERC1410, ERC20BaseProperties {
         self.abi = abi
         self.transaction = transaction
         self.transaction.to = address
-        // Forced because this should fail if contract is wrongly configured
+        // TODO: Make `init` and `web3.contract.init` throwing. Forced because this should fail if ABI is wrongly configured
         contract = web3.contract(abi, at: address)!
         basePropertiesProvider = ERC20BasePropertiesProvider(contract: contract)
     }
diff --git a/Sources/web3swift/Tokens/ERC1594/Web3+ERC1594.swift b/Sources/web3swift/Tokens/ERC1594/Web3+ERC1594.swift
@@ -48,7 +48,7 @@ public class ERC1594: IERC1594, ERC20BaseProperties {
         self.transaction = transaction
         self.transaction.to = address
         self.abi = abi
-        // Forced because this should fail if contract is wrongly configured
+        // TODO: Make `init` and `web3.contract.init` throwing. Forced because this should fail if ABI is wrongly configured
         contract = web3.contract(abi, at: address)!
         basePropertiesProvider = ERC20BasePropertiesProvider(contract: contract)
     }
diff --git a/Sources/web3swift/Tokens/ERC1633/Web3+ERC1633.swift b/Sources/web3swift/Tokens/ERC1633/Web3+ERC1633.swift
@@ -35,7 +35,7 @@ public class ERC1633: IERC1633, ERC20BaseProperties {
         self.transaction = transaction
         self.transaction.to = address
         self.abi = abi
-        // Forced because this should fail if contract is wrongly configured
+        // TODO: Make `init` and `web3.contract.init` throwing. Forced because this should fail if ABI is wrongly configured
         contract = web3.contract(abi, at: address)!
         basePropertiesProvider = ERC20BasePropertiesProvider(contract: contract)
     }
diff --git a/Sources/web3swift/Tokens/ERC1643/Web3+ERC1643.swift b/Sources/web3swift/Tokens/ERC1643/Web3+ERC1643.swift
@@ -38,7 +38,7 @@ public class ERC1643: IERC1643, ERC20BaseProperties {
         self.transaction = transaction
         self.transaction.to = address
         self.abi = abi
-        // Forced because this should fail if contract is wrongly configured
+        // TODO: Make `init` and `web3.contract.init` throwing. Forced because this should fail if ABI is wrongly configured
         contract = web3.contract(abi, at: address)!
         basePropertiesProvider = ERC20BasePropertiesProvider(contract: contract)
     }
diff --git a/Sources/web3swift/Tokens/ERC1644/Web3+ERC1644.swift b/Sources/web3swift/Tokens/ERC1644/Web3+ERC1644.swift
@@ -37,7 +37,7 @@ public class ERC1644: IERC1644, ERC20BaseProperties {
         self.transaction = transaction
         self.transaction.to = address
         self.abi = abi
-        // Forced because this should fail if contract is wrongly configured
+        // TODO: Make `init` and `web3.contract.init` throwing. Forced because this should fail if ABI is wrongly configured
         contract = web3.contract(abi, at: address)!
         basePropertiesProvider = ERC20BasePropertiesProvider(contract: contract)
     }
diff --git a/Sources/web3swift/Tokens/ERC20/Web3+ERC20.swift b/Sources/web3swift/Tokens/ERC20/Web3+ERC20.swift
@@ -36,7 +36,7 @@ public class ERC20: IERC20, ERC20BaseProperties {
         self.provider = provider
         self.address = address
         self.transaction = transaction
-        // Forced because this should fail if contract is wrongly configured
+        // TODO: Make `init` and `web3.contract.init` throwing. Forced because this should fail if ABI is wrongly configured
         contract = web3.contract(Web3.Utils.erc20ABI, at: address)!
         basePropertiesProvider = ERC20BasePropertiesProvider(contract: contract)
     }
diff --git a/Sources/web3swift/Tokens/ERC777/Web3+ERC777.swift b/Sources/web3swift/Tokens/ERC777/Web3+ERC777.swift
@@ -46,7 +46,7 @@ public class ERC777: IERC777, ERC20BaseProperties {
         self.transaction = transaction
         self.transaction.to = address
         self.abi = abi
-        // Forced because this should fail if contract is wrongly configured
+        // TODO: Make `init` and `web3.contract.init` throwing. Forced because this should fail if ABI is wrongly configured
         contract = web3.contract(abi, at: address)!
         basePropertiesProvider = ERC20BasePropertiesProvider(contract: contract)
     }
diff --git a/Sources/web3swift/Tokens/ERC888/Web3+ERC888.swift b/Sources/web3swift/Tokens/ERC888/Web3+ERC888.swift
@@ -33,7 +33,7 @@ public class ERC888: IERC888, ERC20BaseProperties {
         self.transaction = transaction
         self.transaction.to = address
         self.abi = abi
-        // Forced because this should fail if contract is wrongly configured
+        // TODO: Make `init` and `web3.contract.init` throwing. Forced because this should fail if ABI is wrongly configured
         contract = web3.contract(abi, at: address)!
         basePropertiesProvider = ERC20BasePropertiesProvider(contract: contract)
     }
diff --git a/Sources/web3swift/Tokens/ST20/Web3+ST20.swift b/Sources/web3swift/Tokens/ST20/Web3+ST20.swift
@@ -44,7 +44,7 @@ public class ST20: IST20, ERC20BaseProperties {
         self.transaction = transaction
         self.transaction.to = address
         self.abi = abi
-        // Forced because this should fail if contract is wrongly configured
+        // TODO: Make `init` and `web3.contract.init` throwing. Forced because this should fail if ABI is wrongly configured
         contract = web3.contract(abi, at: address)!
         basePropertiesProvider = ERC20BasePropertiesProvider(contract: contract)
     }
diff --git a/Sources/web3swift/Tokens/ST20/Web3+SecurityToken.swift b/Sources/web3swift/Tokens/ST20/Web3+SecurityToken.swift
@@ -79,7 +79,7 @@ public class SecurityToken: ISecurityToken, ERC20BaseProperties {
         self.transaction = transaction
         self.transaction.to = address
         self.abi = abi
-        // Forced because this should fail if contract is wrongly configured
+        // TODO: Make `init` and `web3.contract.init` throwing. Forced because this should fail if ABI is wrongly configured
         contract = web3.contract(abi, at: address)!
         basePropertiesProvider = ERC20BasePropertiesProvider(contract: contract)
     }
diff --git a/Sources/web3swift/Web3/Web3+Contract.swift b/Sources/web3swift/Web3/Web3+Contract.swift
@@ -33,6 +33,7 @@ extension Web3 {
                 print("ABIv1 bound contract is now deprecated")
                 return nil
             case 2:
+                // TODO: should throw
                 guard let contract = try? EthereumContract(abiString, at: at) else {return nil}
                 self.contract = contract
             default:

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public class ERC1376: IERC1376, ERC20BaseProperties {`
`83`	`83`	`self.transaction = transaction`
`84`	`84`	`self.transaction.to = address`
`85`	`85`	`self.abi = abi`
`86`		`- // Forced because this should fail if contract is wrongly configured`
	`86`	+ // TODO: Make `init` and `web3.contract.init` throwing. Forced because this should fail if ABI is wrongly configured
`87`	`87`	`contract = web3.contract(abi, at: address)!`
`88`	`88`	`basePropertiesProvider = ERC20BasePropertiesProvider(contract: contract)`
`89`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public class ERC1400: IERC1400, ERC20BaseProperties {`
`80`	`80`	`self.transaction = transaction`
`81`	`81`	`self.transaction.to = address`
`82`	`82`	`self.abi = abi`
`83`		`- // Forced because this should fail if contract is wrongly configured`
	`83`	+ // TODO: Make `init` and `web3.contract.init` throwing. Forced because this should fail if ABI is wrongly configured
`84`	`84`	`contract = web3.contract(abi, at: address)!`
`85`	`85`	`basePropertiesProvider = ERC20BasePropertiesProvider(contract: contract)`
`86`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public class ERC1410: IERC1410, ERC20BaseProperties {`
`58`	`58`	`self.abi = abi`
`59`	`59`	`self.transaction = transaction`
`60`	`60`	`self.transaction.to = address`
`61`		`- // Forced because this should fail if contract is wrongly configured`
	`61`	+ // TODO: Make `init` and `web3.contract.init` throwing. Forced because this should fail if ABI is wrongly configured
`62`	`62`	`contract = web3.contract(abi, at: address)!`
`63`	`63`	`basePropertiesProvider = ERC20BasePropertiesProvider(contract: contract)`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public class ERC1594: IERC1594, ERC20BaseProperties {`
`48`	`48`	`self.transaction = transaction`
`49`	`49`	`self.transaction.to = address`
`50`	`50`	`self.abi = abi`
`51`		`- // Forced because this should fail if contract is wrongly configured`
	`51`	+ // TODO: Make `init` and `web3.contract.init` throwing. Forced because this should fail if ABI is wrongly configured
`52`	`52`	`contract = web3.contract(abi, at: address)!`
`53`	`53`	`basePropertiesProvider = ERC20BasePropertiesProvider(contract: contract)`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public class ERC1633: IERC1633, ERC20BaseProperties {`
`35`	`35`	`self.transaction = transaction`
`36`	`36`	`self.transaction.to = address`
`37`	`37`	`self.abi = abi`
`38`		`- // Forced because this should fail if contract is wrongly configured`
	`38`	+ // TODO: Make `init` and `web3.contract.init` throwing. Forced because this should fail if ABI is wrongly configured
`39`	`39`	`contract = web3.contract(abi, at: address)!`
`40`	`40`	`basePropertiesProvider = ERC20BasePropertiesProvider(contract: contract)`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public class ERC1643: IERC1643, ERC20BaseProperties {`
`38`	`38`	`self.transaction = transaction`
`39`	`39`	`self.transaction.to = address`
`40`	`40`	`self.abi = abi`
`41`		`- // Forced because this should fail if contract is wrongly configured`
	`41`	+ // TODO: Make `init` and `web3.contract.init` throwing. Forced because this should fail if ABI is wrongly configured
`42`	`42`	`contract = web3.contract(abi, at: address)!`
`43`	`43`	`basePropertiesProvider = ERC20BasePropertiesProvider(contract: contract)`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public class ERC1644: IERC1644, ERC20BaseProperties {`
`37`	`37`	`self.transaction = transaction`
`38`	`38`	`self.transaction.to = address`
`39`	`39`	`self.abi = abi`
`40`		`- // Forced because this should fail if contract is wrongly configured`
	`40`	+ // TODO: Make `init` and `web3.contract.init` throwing. Forced because this should fail if ABI is wrongly configured
`41`	`41`	`contract = web3.contract(abi, at: address)!`
`42`	`42`	`basePropertiesProvider = ERC20BasePropertiesProvider(contract: contract)`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public class ERC20: IERC20, ERC20BaseProperties {`
`36`	`36`	`self.provider = provider`
`37`	`37`	`self.address = address`
`38`	`38`	`self.transaction = transaction`
`39`		`- // Forced because this should fail if contract is wrongly configured`
	`39`	+ // TODO: Make `init` and `web3.contract.init` throwing. Forced because this should fail if ABI is wrongly configured
`40`	`40`	`contract = web3.contract(Web3.Utils.erc20ABI, at: address)!`
`41`	`41`	`basePropertiesProvider = ERC20BasePropertiesProvider(contract: contract)`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public class ERC777: IERC777, ERC20BaseProperties {`
`46`	`46`	`self.transaction = transaction`
`47`	`47`	`self.transaction.to = address`
`48`	`48`	`self.abi = abi`
`49`		`- // Forced because this should fail if contract is wrongly configured`
	`49`	+ // TODO: Make `init` and `web3.contract.init` throwing. Forced because this should fail if ABI is wrongly configured
`50`	`50`	`contract = web3.contract(abi, at: address)!`
`51`	`51`	`basePropertiesProvider = ERC20BasePropertiesProvider(contract: contract)`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public class ERC888: IERC888, ERC20BaseProperties {`
`33`	`33`	`self.transaction = transaction`
`34`	`34`	`self.transaction.to = address`
`35`	`35`	`self.abi = abi`
`36`		`- // Forced because this should fail if contract is wrongly configured`
	`36`	+ // TODO: Make `init` and `web3.contract.init` throwing. Forced because this should fail if ABI is wrongly configured
`37`	`37`	`contract = web3.contract(abi, at: address)!`
`38`	`38`	`basePropertiesProvider = ERC20BasePropertiesProvider(contract: contract)`
`39`	`39`	`}`