external/ton
1
0
Fork 0
mirror of https://github.com/ton-blockchain/ton synced 2025-03-09 15:40:10 +00:00
Code Issues Releases Wiki Activity

updated vm

Browse source 
- updated func/fift
- additional checks in block validator
- docs
- tunnel prototype in ADNL
This commit is contained in:
ton 2020-03-11 14:19:31 +04:00
parent ba76f1404e
commit 54c7a4dcc3
50 changed files with 972 additions and 300 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tonlib/test/online.cpp
View file

@ -239,7 +239,7 @@ td::Result<QueryId> create_send_grams_query(Client& client, const Wallet& source
data = tonlib_api::make_object<tonlib_api::msg_dataText>(std::move(message));
}
msgs.push_back(tonlib_api::make_object<tonlib_api::msg_message>(
tonlib_api::make_object<tonlib_api::accountAddress>(destination), amount, std::move(data)));
tonlib_api::make_object<tonlib_api::accountAddress>(destination), "", amount, std::move(data)));
auto r_id =
sync_send(client, tonlib_api::make_object<tonlib_api::createQuery>(

37
tonlib/tonlib/TonlibClient.cpp
View file

@ -1851,7 +1851,6 @@ struct ToRawTransactions {
if (r_body_message.is_ok()) {
if (type == 0) {
LOG(ERROR) << "OK " << r_body_message.ok();
data = tonlib_api::make_object<tonlib_api::msg_dataText>(r_body_message.move_as_ok());
} else {
LOG(ERROR) << "TRY DECRYPT";
@ -2177,6 +2176,8 @@ class GenericCreateSendGrams : public TonlibQueryActor {
std::string message;
td::Ref<vm::Cell> body;
td::optional<td::Ed25519::PublicKey> o_public_key;
};
bool allow_send_to_uninited_{false};
std::vector<Action> actions_;
@ -2210,6 +2211,11 @@ class GenericCreateSendGrams : public TonlibQueryActor {
return TonlibError::InvalidField("amount", "can't be negative");
}
res.amount = message.amount_;
if (!message.public_key_.empty()) {
TRY_RESULT(public_key, get_public_key(message.public_key_));
auto key = td::Ed25519::PublicKey(td::SecureString(public_key.key));
res.o_public_key = std::move(key);
}
auto status =
downcast_call2<td::Status>(*message.data_, td::overloaded(
[&](tonlib_api::msg_dataRaw& text) {
@ -2243,7 +2249,7 @@ class GenericCreateSendGrams : public TonlibQueryActor {
return TonlibError::MessageTooLong();
}
TRY_STATUS(std::move(status));
return res;
return std::move(res);
}
td::Result<ton::ManualDns::Action> to_dns_action(tonlib_api::dns_Action& action) {
@ -2465,15 +2471,30 @@ class GenericCreateSendGrams : public TonlibQueryActor {
if (!private_key_) {
return TonlibError::EmptyField("private_key");
}
if (!destination->is_wallet()) {
auto o_public_key = std::move(action.o_public_key);
if (!o_public_key && destination->is_wallet()) {
auto wallet = destination->get_wallet();
auto r_public_key = wallet->get_public_key();
if (r_public_key.is_ok()) {
o_public_key = r_public_key.move_as_ok();
}
}
if (!o_public_key) {
auto smc = ton::SmartContract::create(destination->get_smc_state());
auto r_public_key = ton::GenericAccount::get_public_key(destination->get_smc_state());
if (r_public_key.is_ok()) {
o_public_key = r_public_key.move_as_ok();
}
}
if (!o_public_key) {
return TonlibError::MessageEncryption("Get public key (in destination)");
}
auto wallet = destination->get_wallet();
TRY_RESULT_PREFIX(public_key, wallet->get_public_key(),
TonlibError::AccountActionUnsupported(PSLICE() << "Get public key (in destination) : "
<< destination->get_wallet_type()));
TRY_RESULT_PREFIX(encrypted_message,
SimpleEncryptionV2::encrypt_data(action.message, public_key, private_key_.value()),
SimpleEncryptionV2::encrypt_data(action.message, o_public_key.unwrap(), private_key_.value()),
TonlibError::Internal());
gift.message = encrypted_message.as_slice().str();
gift.is_encrypted = true;

4
tonlib/tonlib/tonlib-cli.cpp
View file

@ -1476,8 +1476,8 @@ class TonlibCli : public td::actor::Actor {
} else {
data = tonlib_api::make_object<tonlib_api::msg_dataText>(message.str());
}
messages.push_back(
tonlib_api::make_object<tonlib_api::msg_message>(std::move(address.address), amount.nano, std::move(data)));
messages.push_back(tonlib_api::make_object<tonlib_api::msg_message>(std::move(address.address), "", amount.nano,
std::move(data)));
return td::Status::OK();
};