Merge pull request #558 from mloit/hotfix/restore-json-functions

yaroslavyaroslav · web-flow · commit 884efc1d77fb · 2022-05-06T15:12:15.000+03:00
diff --git a/Sources/web3swift/Transaction/EthereumTransaction.swift b/Sources/web3swift/Transaction/EthereumTransaction.swift
@@ -445,4 +445,14 @@ extension EthereumTransaction {
         return self.envelope.encode(for: .transaction)
     }
 
+    @available(*, deprecated, message: "use Decodable instead")
+    public static func fromJSON(_ json: [String: Any]) -> EthereumTransaction? {
+        do {
+            let jsonData: Data = try JSONSerialization.data(withJSONObject: json, options: [])
+            return try JSONDecoder().decode(EthereumTransaction.self, from: jsonData)
+        } catch {
+            return nil
+        }
+    }
+
 }
diff --git a/Sources/web3swift/Web3/Web3+Options.swift b/Sources/web3swift/Web3/Web3+Options.swift
@@ -280,3 +280,16 @@ extension TransactionOptions: Decodable {
         }
     }
 }
+
+extension TransactionOptions {
+    @available(*, deprecated, message: "use Decodable instead")
+    public static func fromJSON(_ json: [String: Any]) -> TransactionOptions? {
+        do {
+            let jsonData: Data = try JSONSerialization.data(withJSONObject: json, options: [])
+            return try JSONDecoder().decode(TransactionOptions.self, from: jsonData)
+        } catch {
+            return nil
+        }
+    }
+
+}

Original file line number	Diff line number	Diff line change
`@@ -445,4 +445,14 @@ extension EthereumTransaction {`
`445`	`445`	`return self.envelope.encode(for: .transaction)`
`446`	`446`	`}`
`447`	`447`
	`448`	`+ @available(*, deprecated, message: "use Decodable instead")`
	`449`	`+ public static func fromJSON(_ json: [String: Any]) -> EthereumTransaction? {`
	`450`	`+ do {`
	`451`	`+ let jsonData: Data = try JSONSerialization.data(withJSONObject: json, options: [])`
	`452`	`+ return try JSONDecoder().decode(EthereumTransaction.self, from: jsonData)`
	`453`	`+ } catch {`
	`454`	`+ return nil`
	`455`	`+ }`
	`456`	`+ }`
	`457`	`+`
`448`	`458`	`}`
Original file line number	Diff line number	Diff line change
`@@ -280,3 +280,16 @@ extension TransactionOptions: Decodable {`
`280`	`280`	`}`
`281`	`281`	`}`
`282`	`282`	`}`
	`283`	`+`
	`284`	`+extension TransactionOptions {`
	`285`	`+ @available(*, deprecated, message: "use Decodable instead")`
	`286`	`+ public static func fromJSON(_ json: [String: Any]) -> TransactionOptions? {`
	`287`	`+ do {`
	`288`	`+ let jsonData: Data = try JSONSerialization.data(withJSONObject: json, options: [])`
	`289`	`+ return try JSONDecoder().decode(TransactionOptions.self, from: jsonData)`
	`290`	`+ } catch {`
	`291`	`+ return nil`
	`292`	`+ }`
	`293`	`+ }`
	`294`	`+`
	`295`	`+}`