GetTransactionStatus Should respect txn query with or without 0x. (#3795

)
Zilliqa · Oct 2, 2023 · 5b59c76 · 5b59c76
1 parent 8890d55
commit 5b59c76
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/src/libRemoteStorageDB/RemoteStorageDB.cpp b/src/libRemoteStorageDB/RemoteStorageDB.cpp
@@ -246,7 +246,7 @@ bool RemoteStorageDB::UpdateTxn(const string& txnhash, const TxnStatus status,
   return true;
 }
 
-Json::Value RemoteStorageDB::QueryTxnHash(const std::string& txnhash) {
+Json::Value RemoteStorageDB::QueryTxnHash(const dev::h256& txnhash) {
   LOG_MARKER();
   Json::Value _json{Json::Value::null};
   if (!m_initialized) {
@@ -264,7 +264,7 @@ Json::Value RemoteStorageDB::QueryTxnHash(const std::string& txnhash) {
       return _json;
     }
     auto txnCollection = conn.value()->database(m_dbName)[m_txnCollectionName];
-    auto cursor = txnCollection.find_one(make_document(kvp("ID", txnhash)));
+    auto cursor = txnCollection.find_one(make_document(kvp("ID", txnhash.hex())));
     if (cursor) {
       const auto& json_string = bsoncxx::to_json(cursor.value());
       Json::Reader reader;

diff --git a/src/libRemoteStorageDB/RemoteStorageDB.h b/src/libRemoteStorageDB/RemoteStorageDB.h
@@ -84,7 +84,7 @@ class RemoteStorageDB : boost::noncopyable {
                  const uint64_t& epoch, const bool success = false);
   bool UpdateTxn(const std::string& txnhash, const TxnStatus status,
                  const uint64_t& epoch, const bool success);
-  Json::Value QueryTxnHash(const std::string& txnhash);
+  Json::Value QueryTxnHash(const dev::h256& hash);
   Json::Value QueryPendingTxns(const unsigned int txEpochFirstExclusive,
                                const unsigned int txEpochLastInclusive);
   ModificationState GetModificationState(const TxnStatus status) const;

diff --git a/src/libServer/LookupServer.cpp b/src/libServer/LookupServer.cpp
@@ -2122,12 +2122,10 @@ Json::Value LookupServer::GetTransactionStatus(const string& txnhash) {
     if (!REMOTESTORAGE_DB_ENABLE) {
       throw JsonRpcException(RPC_DATABASE_ERROR, "API not supported");
     }
-    if (txnhash.size() != TRAN_HASH_SIZE * 2) {
-      throw JsonRpcException(RPC_INVALID_PARAMETER,
-                             "Txn Hash size not appropriate");
-    }
 
-    const auto& result = RemoteStorageDB::GetInstance().QueryTxnHash(txnhash);
+    TxnHash tranHash(txnhash);
+
+    const auto& result = RemoteStorageDB::GetInstance().QueryTxnHash(tranHash);
 
     if (result.isMember("error")) {
       throw JsonRpcException(RPC_DATABASE_ERROR, "Internal database error");