IOS-7488 Fix fee history mapping (#782)

tangem · Jul 29, 2024 · b8e0e54 · b8e0e54
1 parent 7f0c64d
commit b8e0e54
Show file tree

Hide file tree

Showing 3 changed files with 84 additions and 7 deletions.
diff --git a/BlockchainSdk/Blockchains/Ethereum/Models/EthereumModels.swift b/BlockchainSdk/Blockchains/Ethereum/Models/EthereumModels.swift
@@ -35,7 +35,7 @@ struct EthereumLegacyFeeResponse {
     let fastGasPrice: BigUInt
 }
 
-public struct EthereumFeeHistory{
+public struct EthereumFeeHistory {
     /// for pending block
     public let baseFee: BigUInt
 

diff --git a/BlockchainSdk/Blockchains/Ethereum/Network/EthereumNetworkService.swift b/BlockchainSdk/Blockchains/Ethereum/Network/EthereumNetworkService.swift
@@ -227,7 +227,7 @@ extension EthereumNetworkService: EVMSmartContractInteractor {
 
 // MARK: - EthereumErrorMapper
 
-fileprivate struct EthereumMapper {
+struct EthereumMapper {
     static func mapError(_ error: Error) -> Error {
         if let moyaError = error as? MoyaError,
            let responseData = moyaError.response?.data,
@@ -273,11 +273,9 @@ fileprivate struct EthereumMapper {
         let marketBaseFee = pendingBaseFee * BigUInt(12) / BigUInt(10)
         let fastBaseFee = pendingBaseFee * BigUInt(15) / BigUInt(10)
 
-        guard let lowRewards = response.reward[safe: 0],
-              let marketRewards = response.reward[safe: 1],
-              let fastRewards = response.reward[safe: 2] else {
-            throw ETHError.failedToParseFeeHistory
-        }
+        let lowRewards = response.reward.compactMap{ $0[safe: 0] }
+        let marketRewards = response.reward.compactMap{ $0[safe: 1] }
+        let fastRewards = response.reward.compactMap{ $0[safe: 2] }
 
         let lowAverage = try mapAverageReward(lowRewards)
         let marketAverage = try mapAverageReward(marketRewards)

diff --git a/BlockchainSdkTests/Ethereum/EthereumTests.swift b/BlockchainSdkTests/Ethereum/EthereumTests.swift
@@ -378,4 +378,83 @@ class EthereumTests: XCTestCase {
             "0xa9059cbb00000000000000000000000075739a5bd4b781cf38c59b9492ef9639e46688bf00000000000000000000000000000000000000000000000000000000000003e8"
         )
     }
+
+    func testFeeHistoryParse() throws {
+        let json =
+        """
+        {
+            "oldestBlock": "0x3906bc3",
+            "reward": [
+                [
+                    "0x861c47fc9",
+                    "0xa7a35bb7a",
+                    "0xba43b17ec"
+                ],
+                [
+                    "0x6fc23ac00",
+                    "0x6fc23ac00",
+                    "0x7aef43037"
+                ],
+                [
+                    "0x6fc23ac00",
+                    "0x7aef43262",
+                    "0x9c765ad41"
+                ],
+                [
+                    "0x737be1dc3",
+                    "0x7558be371",
+                    "0x7aef43358"
+                ],
+                [
+                    "0x6fc23aeec",
+                    "0x7aef41ea5",
+                    "0x9502f38ce"
+                ]
+            ],
+            "baseFeePerGas": [
+                "0x5c14",
+                "0x5a1e",
+                "0x5abc",
+                "0x583d",
+                "0x5732",
+                "0x54f9"
+            ],
+            "gasUsedRatio": [
+                0.3294011263207626,
+                0.55512407750046,
+                0.2798693487006748,
+                0.4054004895571093,
+                0.29574768320265493
+            ]
+        }
+        """
+
+        let decoded = try JSONDecoder().decode(EthereumFeeHistoryResponse.self, from: json.data(using: .utf8)!)
+        let feeHistory = try EthereumMapper.mapFeeHistory(decoded)
+        let response = EthereumMapper.mapToEthereumEIP1559FeeResponse(gasLimit: 21000, feeHistory: feeHistory) 
+
+        let feeParameters = [
+            EthereumEIP1559FeeParameters(
+                gasLimit: response.gasLimit,
+                maxFeePerGas: response.fees.low.max,
+                priorityFee: response.fees.low.priority
+            ),
+            EthereumEIP1559FeeParameters(
+                gasLimit: response.gasLimit,
+                maxFeePerGas: response.fees.market.max,
+                priorityFee: response.fees.market.priority
+            ),
+            EthereumEIP1559FeeParameters(
+                gasLimit: response.gasLimit,
+                maxFeePerGas: response.fees.fast.max,
+                priorityFee: response.fees.fast.priority
+            ),
+        ]
+
+        let fees = feeParameters.map { parameters in
+            parameters.calculateFee(decimalValue: pow(Decimal(10), 18))
+        }
+
+        XCTAssertTrue(fees[0] < fees[1] && fees[1] < fees[2])
+    }
 }