speed up synchronization

- download old files in chunks
- updated docs
- fixed elector/config smartcontracts

Author: ton

crypto/smartcont/config-code.fc

@@ -26,7 +26,7 @@
 
 (int, int) check_validator_set(cell vset) {
   var cs = vset.begin_parse();
-  throw_if(9, (cs~load_uint(8) - 0x11) & -2);  ;; validators#11 or validators_ext#12
+  throw_unless(9, cs~load_uint(8) == 0x12);  ;; validators_ext#12 only
   int utime_since = cs~load_uint(32);
   int utime_until = cs~load_uint(32);
   int total = cs~load_uint(16);
@@ -103,7 +103,7 @@
   .end_cell(), 0);
 }
 
-() after_code_upgrade(slice param, cell old_code) impure method_id(1666) {
+() after_code_upgrade(slice param, cont old_code) impure method_id(1666) {
 }
 
 _ perform_action(cfg_dict, public_key, action, cs) {
@@ -119,7 +119,7 @@ _ perform_action(cfg_dict, public_key, action, cs) {
     var new_code = cs~load_ref();
     set_code(new_code);
     var old_code = get_c3();
-    set_c3(new_code);
+    set_c3(new_code.begin_parse().bless());
     after_code_upgrade(cs, old_code);
     throw(0);
     return (cfg_dict, public_key);
@@ -231,7 +231,7 @@ cell register_vote(vote_dict, action, cs, idx, weight) {
     if (ds.slice_bits() >= 40) {
       var tag = ds~load_uint(8);
       var since = ds.preload_uint(32);
-      if ((tag == 0x11) & (since >= now())) {
+      if ((since <= now()) & (tag == 0x12)) {
         ;; next validator set becomes active!
         var cur_vset = cfg_dict~idict_set_get_ref(kl, 34, next_vset);  ;; next_vset -> cur_vset
         cfg_dict~idict_set_get_ref(kl, 32, cur_vset);   ;; cur_vset -> prev_vset
@@ -241,3 +241,7 @@ cell register_vote(vote_dict, action, cs, idx, weight) {
   }
   set_data(begin_cell().store_ref(cfg_dict).store_slice(cs).end_cell());
 }
+
+int seqno() impure method_id {
+  return get_data().begin_parse().preload_uint(32);
+}

crypto/smartcont/elector-code.fc

@@ -338,7 +338,7 @@ int upgrade_code(s_addr, cs, query_id) {
   var code = cs~load_ref();
   set_code(code);
   ifnot(cs.slice_empty?()) {
-    set_c3(code);
+    set_c3(code.begin_parse().bless());
     ;; run_method3(1666, s_addr, cs, query_id);
     after_code_upgrade(s_addr, cs, query_id);
     throw(0);

crypto/smartcont/gen-zerostate.fif

@@ -215,10 +215,11 @@ now dup orig_vset_valid_for + 0 config.validators!
  *
  */
 "auto/config-code.fif" include   // code in separate source file
-<b 0 32 u, 
+<b configdict ref,  // initial configuration
+   0 32 u,          // seqno
    "config-master" +suffix +".pk" load-generate-keypair drop
    B,
-   configdict ref,
+   newdict dict,   // vote dict
 b> // data
 empty_cell  // libraries
 GR$10  // balance

crypto/smartcont/stdlib.fc

@@ -35,8 +35,10 @@ int check_data_signature(slice data, slice signature, int public_key) asm "CHKSI
 
 cell get_data() asm "c4 PUSH";
 () set_data(cell c) impure asm "c4 POP";
-cell get_c3() impure asm "c3 PUSH";
-() set_c3(cell c) impure asm "c3 POP";
+cont get_c3() impure asm "c3 PUSH";
+() set_c3(cont c) impure asm "c3 POP";
+cont bless(slice s) impure asm "BLESS";
+
 () accept_message() impure asm "ACCEPT";
 () commit() impure asm "COMMIT";
 

crypto/smartcont/update-config-smc.fif

@@ -9,14 +9,14 @@
 $# dup 2 < swap 3 > or ' usage if
 
 "config-master" constant file-base
-0 constant seqno
+0 constant qseqno
 -1 constant idx
 true constant bounce
 "auto/config-code.fif" constant config-source
 100 constant interval  // valid for 100 seconds
 
 $1 =: file-base
-$2 parse-int =: seqno
+$2 parse-int =: qseqno
 def? $3 { @' $3 } { "config-query" } cond constant savefile
 
 file-base +".addr" load-address
@@ -30,7 +30,7 @@ config-source include
 dup <s csr. cr
 
 // create a message
-<b x{4e436f64} s, seqno 32 u, now interval + 32 u, swap ref, b>
+<b x{4e436f64} s, qseqno 32 u, now interval + 32 u, swap ref, b>
 dup ."signing message: " <s csr. cr
 dup hashu config_pk ed25519_sign_uint
 <b b{1000100} s, config_addr addr, 0 Gram, b{00} s,

crypto/smartcont/wallet.fif

@@ -1,11 +1,19 @@
 #!/usr/bin/fift -s
 "TonUtil.fif" include
 
-{ ."usage: " @' $0 type ." <filename-base> <dest-addr> <seqno> <amount> [-B <body-boc>] [-C <transfer-comment>] [<savefile>]" cr
+{ ."usage: " @' $0 type ." <filename-base> <dest-addr> <seqno> <amount> [-n] [-B <body-boc>] [-C <transfer-comment>] [<savefile>]" cr
   ."Creates a request to simple wallet created by new-wallet.fif, with private key loaded from file <filename-base>.pk "
   ."and address from <filename-base>.addr, and saves it into <savefile>.boc ('wallet-query.boc' by default)" cr 1 halt
 } : usage
 "" =: comment  // comment for simple transfers
+true =: allow-bounce
+def? $5 { @' $5 "-n" $= { false =: allow-bounce [forget] $5
+  def? $6 { @' $6 =: $5 [forget] $6 } if
+  def? $7 { @' $7 =: $6 [forget] $7 } if
+  @' $# 1- =: $#
+  } if
+} if
+  
 def? $6 { @' $5 dup "-B" $= swap "-C" $= tuck or
   { @' $6 swap { =: comment } { =: body-boc-file } cond [forget] $6
     def? $7 { @' $7 =: $5 [forget] $7 } { [forget] $5 } cond
@@ -17,7 +25,7 @@ $# dup 4 < swap 5 > or ' usage if
 true constant bounce
 
 $1 =: file-base
-$2 bounce parse-load-address =: bounce 2=: dest_addr
+$2 bounce parse-load-address allow-bounce and =: bounce 2=: dest_addr
 $3 parse-int =: seqno
 $4 $>GR =: amount
 def? $5 { @' $5 } { "wallet-query" } cond constant savefile

crypto/vm/contops.cpp

@@ -626,9 +626,23 @@ inline void throw_rangechk(bool ok) {
 }
 }  // namespace
 
+int exec_bless_pop_c3(VmState* st) {
+  Stack& stack = st->get_stack();
+  VM_LOG(st) << "execute CTOSBLESSPOPc3";
+  stack.check_underflow(1);
+  throw_typechk(st->set_c(3, Ref<OrdCont>{true, vm::load_cell_slice_ref(stack.pop_cell()), st->get_cp()}));
+  return 0;
+}
+
 int exec_pop_ctr(VmState* st, unsigned args) {
   unsigned idx = args & 15;
   VM_LOG(st) << "execute POP c" << idx;
+  /*
+  if (idx == 3 && st->get_stack().depth() > 0 && st->get_stack().tos().is(StackEntry::t_cell)) {
+    // temp hack: accept cell argument for POP c3 and do auto-BLESSing
+    return exec_bless_pop_c3(st);
+  }
+  */
   throw_typechk(st->set(idx, st->get_stack().pop_chk()));
   return 0;
 }

doc/FullNode-HOWTO

@@ -5,7 +5,7 @@ Note that you need a machine with a public IP address and a high-bandwidth netwo
 0. Downloading and compiling
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The complete TON Blockchain Library and Validator software is downloaded and compiled similarly to the Lite Client. This process is outlined in the corresponding README file. The most important difference is that you have to download the complete sources from public GitHub repository https://github.com/ton-blockchain/ton (e.g., by running `git clone https://github.com/ton-blockchain/ton`) instead of downloading the smaller Lite Client source archive. You should also build all goals defined in CMakeLists.txt (e.g. by running `cmake <path-to-source-directory>` and `make` in your build directory), not only those specifically related to the Lite Client (which is also included in the larger distribution; you don't have to download and build it separately). We strongly recommend building a "release" or a "release with debug information" version of the TON Blockchain Library and especially of the Validator/Full Node by passing `-DCMAKE_BUILD_TYPE=Release` or `-DCMAKE_BUILD_TYPE=RelWithDebInfo` as an extra argument to `cmake` during its first run (if you forgot to do this, you can later delete file `CMakeCache.txt` from your build directory and re-run `cmake` with the appropriate options).
+The complete TON Blockchain Library and Validator software is downloaded and compiled similarly to the Lite Client. This process is outlined in the corresponding README file. The most important difference is that you have to download the complete sources from public GitHub repository https://github.com/ton-blockchain/ton (e.g., by running `git clone https://github.com/ton-blockchain/ton` and `git submodule update` afterwards) instead of downloading the smaller Lite Client source archive. You should also build all goals defined in CMakeLists.txt (e.g. by running `cmake <path-to-source-directory>` and `make` in your build directory), not only those specifically related to the Lite Client (which is also included in the larger distribution; you don't have to download and build it separately). We strongly recommend building a "release" or a "release with debug information" version of the TON Blockchain Library and especially of the Validator/Full Node by passing `-DCMAKE_BUILD_TYPE=Release` or `-DCMAKE_BUILD_TYPE=RelWithDebInfo` as an extra argument to `cmake` during its first run (if you forgot to do this, you can later delete file `CMakeCache.txt` from your build directory and re-run `cmake` with the appropriate options).
 
 1. Full Node binaries
 ~~~~~~~~~~~~~~~~~~~~~

doc/Validator-HOWTO

@@ -10,7 +10,7 @@ The basic instructions are the same as for a TON Blockchain Full Node, as explai
 1. Controlling smart contract of a validator
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-In order to run a Validator, you'll need a Full Node that is already up and running (and completely synchronized with the current blockchain state), and a wallet in the masterchain holding a large amount of Grams (or test Grams, if you want to run a validator in the "testnet" TON Blockchain instance). Typically you'll need at least 100,000 Grams.
+In order to run a Validator, you'll need a Full Node that is already up and running (and completely synchronized with the current blockchain state), and a wallet in the masterchain holding a large amount of Grams (or test Grams, if you want to run a validator in the "testnet" TON Blockchain instance). Typically you'll need at least 100,001 Grams in the production network, and at least 10,001 test Grams in the test network. The actual value (in nanograms) can be found as the value of `min_stake` in configuration parameter #17 (available by typing `getconfig 17` into the Lite Client), plus one Gram.
 
 Each validator is identified by its (Ed25519) public key. During the validator elections, the validator (or rather its public key) is also associated with a smart contract residing in the masterchain. For simplicity, we say that the validator is "controlled" by this smart contract (e.g., a wallet smart contract). Stakes are accepted on behalf of this validator only if they arrive from its associated smart contract, and only that associated smart contract is entitled to collect the validator's stake after it is unfrozen, along with the validator's share of bonuses (e.g., block mining fees, transaction and message forwarding fees collected from the users of the TON Blockchain by the validator pool). Typically the bonuses are distributed proportionally to the (effective) stakes of the validators. On the other hand, validators with higher stakes are assigned a larger amount of work to perform (i.e., they have to create and validate blocks for more shardchains), so it is important not to stake an amount that will yield more validation work than your node is capable of handling.
 

lite-client-docs/README

@@ -8,18 +8,19 @@ The software is likely to compile and work properly on most Linux systems. It sh
 
 BASIC COMPILATION AND INSTALLATION INSTRUCTIONS
 
-1) Download and unpack the newest version of this archive, available at
+1) Download the newest version of the TON blockchain sources, available at GitHub repository https://github.com/ton-blockchain/ton/ :
 
-https://test.ton.org/download
+git clone https://github.com/ton-blockchain/ton.git
+git submodule update
 
 The TON Blockchain Test Network is updated quite often, so we cannot guarantee that older versions of the Lite Client will always work. Backward compatibility is not enforced at this development stage.
 
 2) Install the newest versions of make, cmake (version 3.0.2 or later), OpenSSL (including C header files), and g++ or clang (or another C++14-compatible compiler as appropriate for your operating system). We strongly recommend installing OpenSSL version 1.1.1 or later for better performance, especially if you intend to run a Full Node or a Validator as well.
 
-3) Suppose that you have unpacked this archive to directory ~/lite-client, where ~ is your home directory, and that you have created an empty directory ~/liteclient-build. Then run the following in a terminal on a Linux system:
+3) Suppose that you have fetched the source tree to directory ~/ton, where ~ is your home directory, and that you have created an empty directory ~/liteclient-build. Then run the following in a terminal on a Linux system:
 
 cd ~/liteclient-build
-cmake ~/lite-client
+cmake ~/ton
 cmake --build . --target lite-client
 
 You might also build some extra utilities useful for smart-contract development:

validator/db/archive-manager.cpp

@@ -250,8 +250,7 @@ void ArchiveManager::get_file_short_cont(FileReference ref_id, PackageId idx, td
 
 void ArchiveManager::get_file(BlockHandle handle, FileReference ref_id, td::Promise<td::BufferSlice> promise) {
   if (handle->moved_to_archive()) {
-    auto f = get_file_desc(handle->id().shard_full(), PackageId{handle->masterchain_ref_block(), false, false}, 0, 0, 0,
-                           false);
+    auto f = get_file_desc(handle->id().shard_full(), get_package_id(handle->masterchain_ref_block()), 0, 0, 0, false);
     if (f) {
       td::actor::send_closure(f->file_actor_id(), &ArchiveSlice::get_file, std::move(ref_id), std::move(promise));
       return;

validator/downloaders/download-state.cpp

@@ -193,6 +193,9 @@ void DownloadShardState::written_shard_state(td::Ref<ShardState> state) {
   handle_->set_logical_time(state_->get_logical_time());
   handle_->set_applied();
   handle_->set_split(state_->before_split());
+  if (!block_id_.is_masterchain()) {
+    handle_->set_masterchain_ref_block(masterchain_block_id_.seqno());
+  }
 
   auto P = td::PromiseCreator::lambda([SelfId = actor_id(this), handle = handle_](td::Result<td::Unit> R) {
     CHECK(handle->handle_moved_to_archive());

validator/full-node.cpp

@@ -99,7 +99,6 @@ void FullNodeImpl::initial_read_complete(BlockHandle top_handle) {
 }
 
 void FullNodeImpl::add_shard(ShardIdFull shard) {
-  LOG(WARNING) << "add shard " << shard;
   while (true) {
     if (shards_.count(shard) == 0) {
       shards_.emplace(shard, FullNodeShard::create(shard, local_id_, adnl_id_, zero_state_file_hash_, keyring_, adnl_,
@@ -239,6 +238,7 @@ void FullNodeImpl::download_archive(BlockSeqno masterchain_seqno, std::string tm
 }
 
 td::actor::ActorId<FullNodeShard> FullNodeImpl::get_shard(ShardIdFull shard) {
+  add_shard(ShardIdFull{shard.workchain, shardIdAll});
   while (shards_.count(shard) == 0) {
     if (shard.shard == shardIdAll) {
       return td::actor::ActorId<FullNodeShard>{};