Merge branch 'testnet' into collated-data-opt

Author: SpyCheese

.lldbinit

@@ -0,0 +1,6 @@
+# to make this (local) .lldbinit work, don't forget to add the following line to global ~/.lldbinit:
+# settings set target.load-cwd-lldbinit true
+
+command script import lldb_addons.py
+
+settings set target.process.thread.step-avoid-regexp tolk::ASTNodeBase::as<.+>|tolk::Vertex<.+>::get_.+|std::.+

crypto/smartcont/tolk-stdlib/common.tolk

@@ -0,0 +1,55 @@
+// A part of standard library for Tolk
+tolk 1.2
+
+enum ExoticCellType: int8 {
+    Ordinary = -1
+    PrunedBranch = 1
+    LibraryReference = 2
+    MerkleProof = 3
+    MerkleUpdate = 4
+}
+
+/// Transforms an ordinary or exotic cell into a slice, as if it were an ordinary cell. 
+/// A flag is returned indicating whether c is exotic. 
+/// If so, ExoticCellType can later be deserialized from the first eight bits of s.
+/// ```
+/// var (s, isExotic) = c.beginParseSpecial();
+/// if (isExotic) {
+///     // use unsafe cast because the first 8 bits hold a correct value, no need for validation
+///     val cellType = s.loadInt(8) as ExoticCellType;
+/// }
+/// ```
+@pure
+fun cell.beginParseSpecial(self): (slice, bool)
+    asm "XCTOS"
+
+/// Creates an exotic or ordinary cell from a builder.
+@pure
+fun builder.endCellSpecial(self, isExotic: bool = true): cell
+    asm "ENDXC"
+
+/// Returns i-th hash of the cell.
+@pure
+fun cell.hashOfLevel(self, level: int): uint256
+    asm "CHASHIX"
+
+/// Returns i-th depth of the cell.
+@pure
+fun cell.depthOfLevel(self, level: int): int
+    asm "CDEPTHIX"
+
+/// Loads an exotic cell and returns an ordinary cell.
+/// If the cell is already ordinary, does nothing. Throws an exception if cannot be loaded.
+@pure
+fun cell.loadSpecial(self): cell
+    asm "XLOAD"
+
+/// Transforms an ordinary or exotic cell into a library reference
+/// (into an exotic cell with contents "8 bits cell type" + "256 bits lib hash").
+@pure
+fun cell.toLibraryReference(self): cell {
+    return beginCell()
+        .storeInt(ExoticCellType.LibraryReference as int, 8)
+        .storeUint(self.hash(), 256)
+        .endCellSpecial()
+}

crypto/smartcont/tolk-stdlib/exotic-cells.tolk

@@ -1,5 +1,5 @@
 // A part of standard library for Tolk
-tolk 1.1
+tolk 1.2
 
 /**
   Gas and payment related primitives.
@@ -33,10 +33,12 @@ fun setGasLimit(limit: int): void
     asm "SETGASLIMIT"
 
 /// Calculates fee (amount in nanotoncoins to be paid) for a transaction which consumed `gasUsed` gas units.
+@pure
 fun calculateGasFee(workchain: int8, gasUsed: int): coins
     asm(gasUsed workchain) "GETGASFEE"
 
 /// Same as [calculateGasFee], but without flat price. [Docs about fees](https://docs.ton.org/develop/howto/fees-low-level)
+@pure
 fun calculateGasFeeWithoutFlatPrice(workchain: int8, gasUsed: coins): coins
     asm(gasUsed workchain) "GETGASFEESIMPLE"
 
@@ -46,10 +48,12 @@ fun calculateStorageFee(workchain: int8, seconds: int, bits: int, cells: int): c
     asm(cells bits seconds workchain) "GETSTORAGEFEE"
 
 /// Calculates amount of nanotoncoins you should pay to send a message of a specified size.
+@pure
 fun calculateForwardFee(workchain: int8, bits: int, cells: int): coins
     asm(cells bits workchain) "GETFORWARDFEE"
 
 /// Same as [calculateForwardFee], but without lump price. [Docs about fees](https://docs.ton.org/develop/howto/fees-low-level)
+@pure
 fun calculateForwardFeeWithoutLumpPrice(workchain: int8, bits: int, cells: int): coins
     asm(cells bits workchain) "GETFORWARDFEESIMPLE"
 

crypto/smartcont/tolk-stdlib/gas-payments.tolk

@@ -1,5 +1,5 @@
 // A part of standard library for Tolk
-tolk 1.1
+tolk 1.2
 
 /**
     Lisp-style lists are nested 2-elements tuples: `[1, [2, [3, null]]]` represents list `[1, 2, 3]`.

crypto/smartcont/tolk-stdlib/lisp-lists.tolk

@@ -1,5 +1,5 @@
 // A part of standard library for Tolk
-tolk 1.1
+tolk 1.2
 
 /**
     Low-level API working with TVM dictionaries.

crypto/smartcont/tolk-stdlib/tvm-dicts.tolk

@@ -1,5 +1,5 @@
 // A part of standard library for Tolk
-tolk 1.1
+tolk 1.2
 
 /// Usually `c3` has a continuation initialized by the whole code of the contract. It is used for function calls.
 /// The primitive returns the current value of `c3`.

crypto/smartcont/tolk-stdlib/tvm-lowlevel.tolk

@@ -0,0 +1,91 @@
+# noinspection PyUnresolvedReferences
+import lldb
+
+
+def call_cpp_debug_print(valobj, arg_type: str):
+    type = valobj.GetType()
+    if type.is_reference or type.is_pointer:
+        addr = valobj.Dereference().GetAddress()
+    else:
+        addr = valobj.GetAddress()
+    if not addr.IsValid():
+        return "nullptr"
+
+    s = valobj.GetFrame().EvaluateExpression('debug_print(({}*){})'.format(arg_type, addr)).GetSummary()
+    s = str(s)[1:-1]  # trim quotes
+
+    if "{enum.Op.cl}" in s:
+        s = s.replace("{enum.Op.cl}", valobj.GetChildMemberWithName("cl").GetValue())
+    if "{enum.AsmOp.t}" in s:
+        s = s.replace("{enum.AsmOp.t}", valobj.GetChildMemberWithName("t").GetValue())
+    return s
+
+
+def print_td_RefInt256(valobj, internal_dict, options):
+    n = valobj.EvaluateExpression("ptr.value.n").GetValueAsUnsigned()
+    if n == 0:
+        return "0"
+    if n == 1:
+        return valobj.EvaluateExpression("ptr.value.digits[0]").GetValueAsUnsigned()
+    return "n=" + str(n)
+
+
+def print_ast_vertex(valobj, internal_dict, options):
+    type = valobj.GetType()
+    if type.is_reference or type.is_pointer:
+        addr = valobj.Dereference().GetAddress()
+    else:
+        addr = valobj.GetAddress()
+    if not addr.IsValid():
+        return "nullptr"
+
+    s = valobj.GetFrame().EvaluateExpression('debug_print((tolk::ASTNodeBase*){})'.format(addr)).GetSummary()
+    s = str(s)[1:-1]  # trim quotes
+
+    return s
+
+
+def __lldb_init_module(debugger, _):
+    types_with_debug_print = [
+        'tolk::Op',
+        'tolk::TypeData',
+        'tolk::VarDescr',
+        'tolk::TmpVar',
+        'tolk::VarDescrList',
+        'tolk::AsmOp',
+        'tolk::AsmOpList',
+        'tolk::Stack',
+        'tolk::SrcRange',
+        'tolk::LocalVarData',
+        'tolk::FunctionData',
+        'tolk::GlobalVarData',
+        'tolk::GlobalConstData',
+        'tolk::AliasDeclarationData',
+        'tolk::StructFieldData',
+        'tolk::StructData',
+        'tolk::EnumMemberData',
+        'tolk::EnumDefData',
+        'tolk::FlowContext',
+        'tolk::SinkExpression',
+        'tolk::InfoAboutExpr',
+        'tolk::GenericsDeclaration',
+        'tolk::GenericsSubstitutions',
+    ]
+    for arg_type in types_with_debug_print:
+        debugger.HandleCommand('type summary add --python-script "return lldb_addons.call_cpp_debug_print(valobj, \'{}\')" {}'.format(arg_type, arg_type))
+
+    debugger.HandleCommand('type summary add --python-function "lldb_addons.print_ast_vertex" tolk::ASTNodeBase')
+    debugger.HandleCommand('type summary add --python-function "lldb_addons.print_ast_vertex" tolk::ASTNodeDeclaredTypeBase')
+    debugger.HandleCommand('type summary add --python-function "lldb_addons.print_ast_vertex" tolk::ASTNodeExpressionBase')
+    debugger.HandleCommand('type summary add --python-function "lldb_addons.print_ast_vertex" tolk::ASTNodeStatementBase')
+    debugger.HandleCommand('type summary add --python-function "lldb_addons.print_ast_vertex" tolk::ASTTypeLeaf')
+    debugger.HandleCommand('type summary add --python-function "lldb_addons.print_ast_vertex" tolk::ASTTypeVararg')
+    debugger.HandleCommand('type summary add --python-function "lldb_addons.print_ast_vertex" tolk::ASTExprLeaf')
+    debugger.HandleCommand('type summary add --python-function "lldb_addons.print_ast_vertex" tolk::ASTExprUnary')
+    debugger.HandleCommand('type summary add --python-function "lldb_addons.print_ast_vertex" tolk::ASTExprBinary')
+    debugger.HandleCommand('type summary add --python-function "lldb_addons.print_ast_vertex" tolk::ASTExprVararg')
+    debugger.HandleCommand('type summary add --python-function "lldb_addons.print_ast_vertex" tolk::ASTStatementUnary')
+    debugger.HandleCommand('type summary add --python-function "lldb_addons.print_ast_vertex" tolk::ASTStatementVararg')
+    debugger.HandleCommand('type summary add --python-function "lldb_addons.print_ast_vertex" -x "^tolk::V<.+>$"')
+    debugger.HandleCommand('type summary add --python-function "lldb_addons.print_ast_vertex" -x "^tolk::Vertex<.+>$"')
+    debugger.HandleCommand('type summary add --python-function "lldb_addons.print_td_RefInt256" td::RefInt256')

lldb_addons.py

@@ -598,8 +598,12 @@ BroadcastCheckResult Certificate::check(PublicKeyHash node, OverlayIdShort overl
 }
 
 tl_object_ptr<ton_api::overlay_Certificate> Certificate::tl() const {
-  return create_tl_object<ton_api::overlay_certificate>(issued_by_.get<PublicKey>().tl(), expire_at_, max_size_,
-                                                        signature_.clone_as_buffer_slice());
+  if (flags_ == cert_default_flags(max_size_)) {
+    return create_tl_object<ton_api::overlay_certificate>(issued_by_.get<PublicKey>().tl(), expire_at_, max_size_,
+                                                          signature_.clone_as_buffer_slice());
+  }
+  return create_tl_object<ton_api::overlay_certificateV2>(issued_by_.get<PublicKey>().tl(), expire_at_, max_size_,
+                                                          flags_, signature_.clone_as_buffer_slice());
 }
 
 tl_object_ptr<ton_api::overlay_Certificate> Certificate::empty_tl() {

overlay/overlay-manager.cpp

@@ -984,10 +984,11 @@ validatorStats.validatedBlock
     self:int256
     valid:Bool comment:string
     bytes:int collated_data_bytes:int
-    total_time:double work_time:double cpu_work_time:double time_stats:string
+    total_time:double work_time:double actual_time:double cpu_work_time:double time_stats:string
     work_time_real_stats:string
     work_time_cpu_stats:string
-    storage_stat_cache:validatorStats.storageStatCacheStats = validatorStats.ValidatedBlock;
+    storage_stat_cache:validatorStats.storageStatCacheStats
+    parallel_accounts_validation:Bool = validatorStats.ValidatedBlock;
 
 validatorStats.newValidatorGroup.node id:int256 pubkey:PublicKey adnl_id:int256 weight:long = validatorStats.newValidatorGroup.Node;
 validatorStats.newValidatorGroup session_id:int256 shard:tonNode.shardId cc_seqno:int