Fix/tzindex gas price (#864)

* fixed tzindex gasPrice * using gas_limit instead of gas_used * protect against legacy field and 0 division * bump libcore version
LedgerHQ · Apr 4, 2022 · 38eec6c · 38eec6c
1 parent 5da44a6
commit 38eec6c
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -44,7 +44,7 @@ include_what_you_use()  # add cmake conf option IWYU=ON to activate
 # The project version number.
 set(VERSION_MAJOR   4   CACHE STRING "Project major version number.")
 set(VERSION_MINOR   1   CACHE STRING "Project minor version number.")
-set(VERSION_PATCH   8   CACHE STRING "Project patch version number.")
+set(VERSION_PATCH   9   CACHE STRING "Project patch version number.")
 mark_as_advanced(VERSION_MAJOR VERSION_MINOR VERSION_PATCH)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY build)

diff --git a/core/src/wallet/tezos/explorers/ExternalTezosLikeBlockchainExplorer.cpp b/core/src/wallet/tezos/explorers/ExternalTezosLikeBlockchainExplorer.cpp
@@ -131,19 +131,53 @@ namespace ledger {
         Future<std::shared_ptr<BigInt>>
         ExternalTezosLikeBlockchainExplorer::getGasPrice() {
             const bool parseNumbersAsString = true;
+            // Since tzindex 12.01, we don't have gas_price field anymore
+            // We have to calculate it instead from gas_limit and fee
+            const auto gasLimitField = "gas_limit";
+            const auto feeField = "fee";
+            // We still use the legacy field in case we have a rollback
             const auto gasPriceField = "gas_price";
 
             return _http->GET("block/head")
                     .json(parseNumbersAsString).mapPtr<BigInt>(getContext(), [=](const HttpRequest::JsonResult &result) {
                         auto &json = *std::get<1>(result);
 
-                        if (!json.IsObject() || !json.HasMember(gasPriceField) ||
-                            !json[gasPriceField].IsString()) {
-                            throw make_exception(api::ErrorCode::HTTP_ERROR,
-                                                 fmt::format("Failed to get gas_price from network, no (or malformed) field \"{}\" in response", gasPriceField));
+                        if (!json.IsObject()) {
+                            throw make_exception(
+                                api::ErrorCode::HTTP_ERROR, "Failed to compute gas_price from network, block/head is not a JSON object");
+                        }
+                        std::string gasPrice;
+                        // Legacy field access
+                        if (json.HasMember(gasPriceField) && json[gasPriceField].IsString()) {
+                            gasPrice = json[gasPriceField].GetString();
                         }
-                        const std::string apiGasPrice = json[gasPriceField].GetString();
-                        const std::string picoTezGasPrice = api::BigInt::fromDecimalString(apiGasPrice, 6, ".")->toString(10);
+                        // OR
+                        // tzindex v12+ gas_price compute
+                        else {
+                            if (!json.HasMember(gasLimitField) || !json[gasLimitField].IsString()) {
+                                throw make_exception(
+                                    api::ErrorCode::HTTP_ERROR, fmt::format(
+                                        "Failed to compute gas_price from network, no (or malformed) field \"{}\" in response",
+                                        gasLimitField));
+                            }
+                            if (!json.HasMember(feeField) || !json[feeField].IsString()) {
+                                throw make_exception(
+                                    api::ErrorCode::HTTP_ERROR, fmt::format(
+                                        "Failed to compute gas_price from network, no (or malformed) field \"{}\" in response",
+                                        feeField));
+                            }
+                            const uint64_t apiGasLimit = std::stoull(json[gasLimitField].GetString());
+                            if (apiGasLimit == 0) {
+                                throw make_exception(
+                                    api::ErrorCode::HTTP_ERROR, "Failed to compute gas_price from network, gas_limit of HEAD block is 0"
+                                );
+                            }
+                            const double apiFee = std::stod(json[feeField].GetString());
+                            const double numericGasPrice = apiFee / static_cast<double>(apiGasLimit);
+                            gasPrice = std::to_string(numericGasPrice);
+                        }
+
+                        const std::string picoTezGasPrice = api::BigInt::fromDecimalString(gasPrice, 6, ".")->toString(10);
                         return std::make_shared<BigInt>(std::stoi(picoTezGasPrice));
                     });
         }