Fix transaction address

Author: dungeon-master-666

crypto/block/check-proof.cpp

@@ -324,6 +324,7 @@ td::Result<BlockTransaction::Info> BlockTransaction::validate() {
     return td::Status::Error("cannot unpack transaction #");
   }
   Info res;
+  res.blkid = blkid;
   res.now = trans.now;
   res.lt = trans.lt;
   res.hash = root->get_hash().bits();
@@ -342,6 +343,7 @@ td::Result<BlockTransactionList::Info> BlockTransactionList::validate() const {
   for (auto& root : list) {
     BlockTransaction transaction;
     transaction.root = root;
+    transaction.blkid = blkid;
     TRY_RESULT(info, transaction.validate());
     res.transactions.push_back(std::move(info));
   }

crypto/block/check-proof.h

@@ -89,9 +89,11 @@ struct TransactionList {
 };
 
 struct BlockTransaction {
+  ton::BlockIdExt blkid;
   td::Ref<vm::Cell> root;
 
   struct Info {
+    ton::BlockIdExt blkid;
     td::uint32 now;
     ton::LogicalTime lt;
     ton::Bits256 hash;
@@ -101,9 +103,11 @@ struct BlockTransaction {
 };
 
 struct BlockTransactionList {
+  ton::BlockIdExt blkid;
   td::BufferSlice transactions_boc;
 
   struct Info {
+    ton::BlockIdExt blkid;
     std::vector<BlockTransaction::Info> transactions;
   };
 

tonlib/tonlib/TonlibClient.cpp

@@ -2363,7 +2363,8 @@ struct ToRawTransactions {
         return td::Status::Error("Failed to fetch storage fee from transaction");
       }
       storage_fee = storage_fees->to_long();
-      address = trans.account_addr.as_slice().str();
+      auto std_address = block::StdAddress(info.blkid.id.workchain, trans.account_addr);
+      address = std_address.rserialize(true);
     }
     return tonlib_api::make_object<tonlib_api::raw_transaction>(
         tonlib_api::make_object<tonlib_api::accountAddress>(std::move(address)),
@@ -2441,7 +2442,8 @@ struct ToRawTransactions {
         return td::Status::Error("Failed to fetch storage fee from transaction");
       }
       storage_fee = storage_fees->to_long();
-      address = trans.account_addr.as_slice().str();
+      auto std_address = block::StdAddress(info.blkid.id.workchain, trans.account_addr);
+      address = std_address.rserialize(true);
     }
     return tonlib_api::make_object<tonlib_api::raw_transaction>(
         tonlib_api::make_object<tonlib_api::accountAddress>(std::move(address)),
@@ -4411,6 +4413,7 @@ td::Status TonlibClient::do_request(const tonlib_api::blocks_getTransactionsExt&
                         r.incomplete_ = bTxes->incomplete_;
                         // bTxes->transactions to block::BlockTransactionList::Info
                         block::BlockTransactionList list;
+                        list.blkid = create_block_id(id);
                         list.transactions_boc = std::move(bTxes->transactions_->transactions_);
                         auto info = list.validate();
                         if (info.is_error()) {