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 fift

Browse source 
updated fift
updated tonlib
This commit is contained in:
ton 2019-10-05 21:21:24 +04:00
parent 7c595294b6
commit 29deff15c3
14 changed files with 137 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crypto/block/block.tlb
View file

@ -421,7 +421,7 @@ block_info#9bc7a987 version:uint32
prev_key_block_seqno:uint32
master_ref:not_master?^BlkMasterInfo
prev_ref:^(BlkPrevInfo after_merge)
prev_vert_ref:vert_seq_no?^(BlkPrevInfo 0)
prev_vert_ref:vert_seqno_incr?^(BlkPrevInfo 0)
= BlockInfo;
prev_blk_info$_ prev:ExtBlkRef = BlkPrevInfo 0;

3
crypto/block/transaction.cpp
View file

@ -739,7 +739,8 @@ td::uint64 ComputePhaseConfig::gas_bought_for(td::RefInt256 nanograms) const {
}
td::RefInt256 ComputePhaseConfig::compute_gas_price(td::uint64 gas_used) const {
return td::rshift(gas_price256 * gas_used, 16, 1);
return gas_used <= flat_gas_limit ? td::make_refint(flat_gas_price)
: td::rshift(gas_price256 * (gas_used - flat_gas_limit), 16, 1) + flat_gas_price;
}
bool Transaction::compute_gas_limits(ComputePhase& cp, const ComputePhaseConfig& cfg) {