Merge branch 'accelerator' into accelerator-test

SpyCheese · Dec 11, 2024 · c01c0ca · c01c0ca
2 parents 32ea583 + 160b539
commit c01c0ca
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/validator-engine-console/validator-engine-console-query.cpp b/validator-engine-console/validator-engine-console-query.cpp
@@ -1607,7 +1607,9 @@ td::Status AddCollatorQuery::send() {
 td::Status AddCollatorQuery::receive(td::BufferSlice data) {
   TRY_RESULT_PREFIX(f, ton::fetch_tl_object<ton::ton_api::engine_validator_success>(data.as_slice(), true),
                     "received incorrect answer: ");
-  td::TerminalIO::out() << "successfully added collator\n";
+  td::TerminalIO::out() << "successfully added collator for shard " << shard_.to_str() << "\n";
+  td::TerminalIO::out() << "ADNL ID = " << adnl_id_.bits256_value().to_hex() << " (" << adnl_id_.bits256_value()
+                        << ")\n";
   return td::Status::OK();
 }
 
@@ -1627,7 +1629,9 @@ td::Status DelCollatorQuery::send() {
 td::Status DelCollatorQuery::receive(td::BufferSlice data) {
   TRY_RESULT_PREFIX(f, ton::fetch_tl_object<ton::ton_api::engine_validator_success>(data.as_slice(), true),
                     "received incorrect answer: ");
-  td::TerminalIO::out() << "successfully removed  collator\n";
+  td::TerminalIO::out() << "successfully removed collator for shard " << shard_.to_str() << "\n";
+  td::TerminalIO::out() << "ADNL ID = " << adnl_id_.bits256_value().to_hex() << " (" << adnl_id_.bits256_value()
+                        << ")\n";
   return td::Status::OK();
 }
 

diff --git a/validator-engine-console/validator-engine-console-query.h b/validator-engine-console/validator-engine-console-query.h
@@ -151,8 +151,8 @@ inline td::Result<ton::ShardIdFull> Tokenizer::get_token() {
   auto r_wc = td::to_integer_safe<ton::WorkchainId>(word);
   if (r_wc.is_ok()) {
     TRY_RESULT_ASSIGN(word, get_raw_token());
-    TRY_RESULT(shard, td::to_integer_safe<ton::ShardId>(word));
-    return ton::ShardIdFull{r_wc.move_as_ok(), shard};
+    TRY_RESULT(shard, td::to_integer_safe<td::int64>(word));
+    return ton::ShardIdFull{r_wc.move_as_ok(), (ton::ShardId)shard};
   }
   return ton::ShardIdFull::parse(word);
 }