Merge pull request #594 from JeneaVranceanu/chore/extensions-with-initializers

Chore: public structs with initializers

Author: yaroslavyaroslav

Sources/web3swift/Contract/ContractProtocol.swift

@@ -58,9 +58,8 @@ public struct EventFilter {
         }
     }
 
-    public init() { }
-
-    public init(fromBlock: Block?, toBlock: Block?,
+    public init(fromBlock: Block? = nil,
+                toBlock: Block? = nil,
                 addresses: [EthereumAddress]? = nil,
                 parameterFilters: [[EventFilterable]?]? = nil) {
         self.fromBlock = fromBlock

Sources/web3swift/KeystoreManager/IBAN.swift

@@ -11,6 +11,12 @@ public struct ICAP {
     public var asset: String
     public var institution: String
     public var client: String
+
+    public init(asset: String, institution: String, client: String) {
+        self.asset = asset
+        self.institution = institution
+        self.client = client
+    }
 }
 
 public struct IBAN {

Sources/web3swift/Tokens/ERC1376/Web3+ERC1376.swift

@@ -18,14 +18,14 @@ public enum IERC1376DelegateMode: UInt {
 }
 
 public struct DirectDebitInfo {
-    let amount: BigUInt
-    let startTime: BigUInt
-    let interval: BigUInt
+    public let amount: BigUInt
+    public let startTime: BigUInt
+    public let interval: BigUInt
 }
 
 public struct DirectDebit {
-    let info: DirectDebitInfo
-    let epoch: BigUInt
+    public let info: DirectDebitInfo
+    public let epoch: BigUInt
 }
 
 extension DirectDebit: Hashable {

Sources/web3swift/Transaction/EthereumParameters.swift

@@ -49,6 +49,30 @@ public struct EthereumParameters {
 
     /// access list for contract execution (EIP-2930 and EIP-1559 only)
     public var accessList: [AccessListEntry]?
+
+    public init(type: TransactionType? = nil,
+                to: EthereumAddress? = nil,
+                nonce: BigUInt? = nil,
+                chainID: BigUInt? = nil,
+                value: BigUInt? = nil,
+                data: Data? = nil,
+                gasLimit: BigUInt? = nil,
+                gasPrice: BigUInt? = nil,
+                maxFeePerGas: BigUInt? = nil,
+                maxPriorityFeePerGas: BigUInt? = nil,
+                accessList: [AccessListEntry]? = nil) {
+        self.type = type
+        self.to = to
+        self.nonce = nonce
+        self.chainID = chainID
+        self.value = value
+        self.data = data
+        self.gasLimit = gasLimit
+        self.gasPrice = gasPrice
+        self.maxFeePerGas = maxFeePerGas
+        self.maxPriorityFeePerGas = maxPriorityFeePerGas
+        self.accessList = accessList
+    }
 }
 
 public extension EthereumParameters {

Sources/web3swift/Web3/Web3+Options.swift

@@ -88,6 +88,32 @@ public struct TransactionOptions {
 
     public var accessList: [AccessListEntry]?
 
+    public init(type: TransactionType? = nil,
+                to: EthereumAddress? = nil,
+                from: EthereumAddress? = nil,
+                chainID: BigUInt? = nil,
+                gasLimit: TransactionOptions.GasLimitPolicy? = nil,
+                gasPrice: TransactionOptions.GasPricePolicy? = nil,
+                maxFeePerGas: TransactionOptions.FeePerGasPolicy? = nil,
+                maxPriorityFeePerGas: TransactionOptions.FeePerGasPolicy? = nil,
+                value: BigUInt? = nil,
+                nonce: TransactionOptions.NoncePolicy? = nil,
+                callOnBlock: TransactionOptions.CallingBlockPolicy? = nil,
+                accessList: [AccessListEntry]? = nil) {
+        self.type = type
+        self.to = to
+        self.from = from
+        self.chainID = chainID
+        self.gasLimit = gasLimit
+        self.gasPrice = gasPrice
+        self.maxFeePerGas = maxFeePerGas
+        self.maxPriorityFeePerGas = maxPriorityFeePerGas
+        self.value = value
+        self.nonce = nonce
+        self.callOnBlock = callOnBlock
+        self.accessList = accessList
+    }
+
     public static var defaultOptions: TransactionOptions {
         var opts = TransactionOptions()
         opts.type = .legacy