Fix ripple explorer (de)serialization issues (#938)

LedgerHQ · Jun 28, 2023 · a0ff9a8 · a0ff9a8
1 parent 48242ce
commit a0ff9a8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/core/src/wallet/ripple/explorers/NodeRippleLikeBlockchainExplorer.cpp b/core/src/wallet/ripple/explorers/NodeRippleLikeBlockchainExplorer.cpp
@@ -215,7 +215,8 @@ namespace ledger {
  bodyRequest.pushParameter("account", addresses[0]);
  bodyRequest.pushParameterBool("forward", true);
  if (fromBlockHash.hasValue() && _paginationMarker.empty()) {
- bodyRequest.pushParameter("ledger_index_min", fromBlockHash.getValue());
+ BigInt blockHash{fromBlockHash.getValue()};
+ bodyRequest.pushParameter("ledger_index_min", blockHash.toUint64());
  }
 
  // handle transaction pagination in the case we have a pagination marker, which happens

diff --git a/core/src/wallet/ripple/explorers/NodeRippleLikeBlockchainExplorer.h b/core/src/wallet/ripple/explorers/NodeRippleLikeBlockchainExplorer.h
@@ -86,6 +86,16 @@ namespace ledger {
  return *this;
  };
 
+ NodeRippleLikeBodyRequest &pushParameter(const std::string &key, uint64_t value) {
+ rapidjson::Document::AllocatorType &allocator = _document.GetAllocator();
+ rapidjson::Value vKeyParam(rapidjson::kStringType);
+ vKeyParam.SetString(key.c_str(), static_cast<rapidjson::SizeType>(key.length()), allocator);
+ rapidjson::Value vParam(rapidjson::kNumberType);
+ vParam.SetUint64(value);
+ _params.AddMember(vKeyParam, vParam, allocator);
+ return *this;
+ };
+
  NodeRippleLikeBodyRequest &pushParameterBool(const std::string &key, bool value) {
  // TODO: C++17 group all 3 pushParameter in a single one with a if constexpr ()
  rapidjson::Document::AllocatorType &allocator = _document.GetAllocator();

diff --git a/core/src/wallet/ripple/explorers/api/RippleLikeTransactionParser.cpp b/core/src/wallet/ripple/explorers/api/RippleLikeTransactionParser.cpp
@@ -161,7 +161,7 @@ namespace ledger {
  _transaction->sender = value;
  } else if (_lastKey == "Destination") {
  _transaction->receiver = value;
- } else if (_lastKey == "Amount") {
+ } else if (_lastKey == "Amount" || _lastKey == "DeliveredAmount") {
  BigInt valueBigInt = BigInt::fromString(value);
  _transaction->value = valueBigInt;
  } else if (_lastKey == "Fee") {