Automatic project update

Author: tonjen

CHANGELOG.md

@@ -0,0 +1,10 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+## Version: 0.50.3
+
+### New
+
+
+

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 edition = '2018'
 name = 'ton_node'
-version = '0.49.4'
+version = '0.50.3'
 
 
 [workspace]
@@ -31,7 +31,7 @@ lazy_static = '1.4.0'
 log = '0.4'
 log4rs = '1'
 log4rs-rolling-file = '0.2.0'
-num-bigint = '0.2.2'
+num-bigint = '0.4'
 openssl = '0.10.35'
 rand = '0.7'
 regex = '^1.3.0'
@@ -42,24 +42,25 @@ sha2 = '0.9'
 spin = '0.7.1'
 stream-cancel = '0.8.0'
 string-builder = '^0.2.0'
-adnl = { features = [ 'client', 'node', 'server' ], git = 'https://github.com/tonlabs/ton-labs-adnl', tag = '0.7.66' }
+adnl = { features = [ 'client', 'node', 'server' ], git = 'https://github.com/tonlabs/ton-labs-adnl', tag = '0.7.67' }
 catchain = { path = 'catchain' }
-dht = { git = 'https://github.com/tonlabs/ton-labs-dht', tag = '0.5.61' }
+dht = { git = 'https://github.com/tonlabs/ton-labs-dht', tag = '0.5.62' }
+ever-crypto = { git = 'https://github.com/tonlabs/ever-labs-crypto', tag = '0.1.7' }
 lockfree = { git = 'https://github.com/tonlabs/lockfree.git' }
-overlay = { git = 'https://github.com/tonlabs/ton-labs-overlay', tag = '0.6.49' }
-rldp = { git = 'https://github.com/tonlabs/ton-labs-rldp', tag = '0.7.60' }
+overlay = { git = 'https://github.com/tonlabs/ton-labs-overlay', tag = '0.6.50' }
+rldp = { git = 'https://github.com/tonlabs/ton-labs-rldp', tag = '0.7.61' }
 rustracing = { optional = true, version = '0.4.0' }
 rustracing_jaeger = { optional = true, version = '0.4.1' }
 statsd = { optional = true, version = '0.14.0' }
 storage = { path = 'storage' }
 tokio = { features = [ 'rt-multi-thread' ], version = '1.5' }
-ton_abi = { git = 'https://github.com/tonlabs/ton-labs-abi.git', tag = '2.1.7' }
+ton_abi = { git = 'https://github.com/tonlabs/ton-labs-abi.git', tag = '2.1.14' }
 ton_api = { git = 'https://github.com/tonlabs/ton-labs-tl', package = 'ton_api', tag = '0.2.120' }
-ton_block = { git = 'https://github.com/tonlabs/ton-labs-block', tag = '1.7.37' }
-ton_block_json = { git = 'https://github.com/tonlabs/ton-labs-block-json.git', tag = '0.7.2' }
-ton_executor = { git = 'https://github.com/tonlabs/ton-labs-executor', tag = '1.15.52' }
+ton_block = { git = 'https://github.com/tonlabs/ton-labs-block', tag = '1.7.39' }
+ton_block_json = { git = 'https://github.com/tonlabs/ton-labs-block-json.git', tag = '0.7.5' }
+ton_executor = { git = 'https://github.com/tonlabs/ton-labs-executor', tag = '1.15.56' }
 ton_types = { git = 'https://github.com/tonlabs/ton-labs-types', tag = '1.10.12' }
-ton_vm = { git = 'https://github.com/tonlabs/ton-labs-vm', tag = '1.8.30' }
+ton_vm = { git = 'https://github.com/tonlabs/ton-labs-vm', tag = '1.8.32' }
 validator_session = { path = 'validator-session' }
 
 [target.'cfg(unix)'.dependencies.rdkafka]
@@ -75,12 +76,9 @@ version = '0.26.0'
 
 [features]
 default = [ 'telemetry' ]
-validator = [ 'async_collator', 'async_validator' ]
 external_db = [ 'rdkafka' ]
-async_collator = [  ]
-async_validator = [  ]
 ci_run = [ 'storage/ci_run' ]
-compression = [ 'overlay/compression', 'rldp/compression' ]
+export_key = [ 'catchain/export_key', 'ever-crypto/export_key' ]
 metrics = [ 'statsd' ]
 slashing = [  ]
 telemetry = [

catchain/Cargo.toml

@@ -22,9 +22,10 @@ regex = '1.3.1'
 sha2 = '0.9'
 tokio = { features = [ 'rt-multi-thread' ], version = '1.5' }
 
-adnl = { features = [ 'node' ], git = 'https://github.com/tonlabs/ton-labs-adnl', tag = '0.7.66' }
-overlay = { git = 'https://github.com/tonlabs/ton-labs-overlay', tag = '0.6.49' }
-rldp = { git = 'https://github.com/tonlabs/ton-labs-rldp', tag = '0.7.60' }
+adnl = { features = [ 'node' ], git = 'https://github.com/tonlabs/ton-labs-adnl', tag = '0.7.67' }
+ever-crypto = { git = 'https://github.com/tonlabs/ever-labs-crypto', tag = '0.1.7' }
+overlay = { git = 'https://github.com/tonlabs/ton-labs-overlay', tag = '0.6.50' }
+rldp = { git = 'https://github.com/tonlabs/ton-labs-rldp', tag = '0.7.61' }
 storage = { path = '../storage' }
 ton_api = { git = 'https://github.com/tonlabs/ton-labs-tl', package = 'ton_api', tag = '0.2.120' }
 ton_types = { git = 'https://github.com/tonlabs/ton-labs-types', tag = '1.10.12' }
@@ -39,3 +40,7 @@ git = 'https://github.com/rust-rocksdb/rust-rocksdb.git'
 [target.'cfg(unix)'.dev-dependencies.rocksdb]
 git = 'https://github.com/rust-rocksdb/rust-rocksdb.git'
 features = [ 'jemalloc' ]
+
+[features]
+default = [  ]
+export_key = [ 'ever-crypto/export_key' ]

catchain/src/lib.rs

@@ -44,10 +44,8 @@ mod receiver;
 mod receiver_source;
 pub mod utils;
 
-use adnl::{
-    common::{KeyId, KeyOption},
-    node::AdnlNode,
-};
+use adnl::node::AdnlNode;
+use ever_crypto::{KeyId, KeyOption};
 use failure::err_msg;
 pub use overlay::PrivateOverlayShortId;
 pub use profiling::{InstanceCounter, ResultStatusCounter};
@@ -63,13 +61,13 @@ use std::{
 use ton_types::types::UInt256;
 
 /// Public key
-pub type PublicKey = Arc<KeyOption>;
+pub type PublicKey = Arc<dyn KeyOption>;
 
 /// Public key hash
 pub type PublicKeyHash = Arc<KeyId>;
 
 /// Private key
-pub type PrivateKey = Arc<KeyOption>;
+pub type PrivateKey = Arc<dyn KeyOption>;
 
 /// Result for operations
 pub type Result<T> = ton_types::Result<T>;

catchain/src/log_player.rs

@@ -827,7 +827,7 @@ impl LogPlayerImpl {
 
         assert!(session_desc.node_ids.len() == session_desc.weights.len());
         assert!(session_desc.local_key.is_some());
-        assert!(session_desc.local_key.as_ref().unwrap().pvt_key().is_ok());
+        assert!(session_desc.local_key.as_ref().unwrap().pub_key().is_err());
 
         //create player
 
@@ -870,7 +870,7 @@ impl LogPlayerImpl {
         for session_desc in log_header.session_descs {
             if session_desc.node_ids.len() != session_desc.weights.len()
                 || session_desc.local_key.is_none()
-                || !session_desc.local_key.as_ref().unwrap().pvt_key().is_ok()
+                || !session_desc.local_key.as_ref().unwrap().pub_key().is_err()
             {
                 continue;
             }

catchain/src/receiver.rs

@@ -17,6 +17,7 @@ use crate::profiling::check_execution_time;
 use crate::profiling::instrument;
 use crate::profiling::ResultStatusCounter;
 use crate::ton_api::IntoBoxed;
+use ever_crypto::Ed25519KeyOption;
 use rand::Rng;
 use std::collections::HashMap;
 use std::collections::VecDeque;
@@ -2538,8 +2539,7 @@ impl ReceiverImpl {
     }
 
     pub(crate) fn create_dummy(path: String) -> Result<ReceiverPtr> {
-        let (_, public_key) = KeyOption::with_type_id(KeyOption::KEY_ED25519)?;
-        let public_key = Arc::new(public_key);
+        let public_key = Ed25519KeyOption::generate()?;
         let ids = vec![CatchainNode {
             public_key: public_key.clone(),
             adnl_id: public_key.id().clone(),

catchain/src/utils.rs

@@ -15,10 +15,12 @@ extern crate hex;
 
 /// Imports
 pub use super::*;
+use ever_crypto::{Ed25519KeyOption, KeyId};
 use crate::ton_api::IntoBoxed;
 use std::collections::BTreeMap;
 use std::collections::HashMap;
 use std::collections::HashSet;
+use std::convert::TryInto;
 
 /*
     to string conversions
@@ -109,24 +111,21 @@ pub fn parse_hex_as_public_key(hex_asm: &str) -> PublicKey {
     let mut key_slice = vec![0; hex_asm.len() / 2];
     parse_hex_to_array(hex_asm, &mut key_slice[..]);
     //TODO: errors processing for key creation
-    Arc::new(adnl::common::KeyOption::from_tl_serialized_public_key(&key_slice).unwrap())
+    Ed25519KeyOption::from_public_key_tl_serialized(&key_slice).unwrap()
 }
 
 pub fn parse_hex_as_public_key_raw(hex_asm: &str) -> PublicKey {
     assert!(hex_asm.len() == 64);
     let mut key_slice = [0u8; 32];
     parse_hex_to_array(hex_asm, &mut key_slice[..]);
     //TODO: errors processing for key creation
-    Arc::new(adnl::common::KeyOption::from_type_and_public_key(
-        adnl::common::KeyOption::KEY_ED25519,
-        &key_slice,
-    ))
+    Ed25519KeyOption::from_public_key(&key_slice)
 }
 
 pub fn parse_hex_as_public_key_hash(hex_asm: &str) -> PublicKeyHash {
     let mut key_slice: [u8; 32] = [0; 32];
     parse_hex_to_array(hex_asm, &mut key_slice);
-    adnl::common::KeyId::from_data(key_slice)
+    KeyId::from_data(key_slice)
 }
 
 pub fn parse_hex_as_session_id(hex_asm: &str) -> SessionId {
@@ -139,8 +138,7 @@ pub fn parse_hex_as_private_key(hex_asm: &str) -> PrivateKey {
     parse_hex_to_array(hex_asm, &mut key_slice[..]);
     //TODO: errors processing for key creation
     assert!(key_slice.len() == 32);
-    let private_key = ed25519_dalek::SecretKey::from_bytes(&key_slice).unwrap();
-    Arc::new(adnl::common::KeyOption::from_ed25519_secret_key(private_key).unwrap())
+    Ed25519KeyOption::from_private_key(key_slice.as_slice().try_into().unwrap()).unwrap()
 }
 
 pub fn parse_hex_as_expanded_private_key(hex_asm: &str) -> PrivateKey {
@@ -149,10 +147,7 @@ pub fn parse_hex_as_expanded_private_key(hex_asm: &str) -> PrivateKey {
     parse_hex_to_array(hex_asm, &mut key_slice[..]);
     //TODO: errors processing for key creation
     assert!(key_slice.len() == 64);
-    let expanded_private_key = ed25519_dalek::ExpandedSecretKey::from_bytes(&key_slice).unwrap();
-    Arc::new(
-        adnl::common::KeyOption::from_ed25519_expanded_secret_key(expanded_private_key).unwrap(),
-    )
+    Ed25519KeyOption::from_expanded_key(key_slice.as_slice().try_into().unwrap()).unwrap()
 }
 
 pub fn get_hash(data: &::ton_api::ton::bytes) -> BlockHash {
@@ -164,7 +159,7 @@ pub fn get_hash_from_block_payload(data: &BlockPayloadPtr) -> BlockHash {
 }
 
 pub fn int256_to_public_key_hash(public_key: &UInt256) -> PublicKeyHash {
-    adnl::common::KeyId::from_data(*public_key.as_slice())
+    KeyId::from_data(*public_key.as_slice())
 }
 
 pub fn get_public_key_hash(public_key: &PublicKey) -> PublicKeyHash {

commit_hash.txt

@@ -1 +1 @@
-1efe43f7be0c4916fb86a24fc8a4d64ac3e0d842
+6e09fac3e8e7d9aaefa709fece9bf9bf2adf2d2f

deps_map.json

@@ -1 +1 @@
-{"adnl":"56dfefa71a4d1f62aa3d5edd9748bcae4ecb4162","dht":"f0dd7c3723962880bea7225de7f1727713386d42","overlay":"ae651875e43cbe840fc974eb78b4e2619106f1c6","rldp":"dba5fedd7d1a652c35918fd0eb0b6ddc30d4576f","ton-labs-abi":"ec48e6f90fc0ad6b73ce5c2501807a94b38c056a","ton-tl":"f36ed7353e15dbc472170b28c9a63fca6a64f3a1","ton-block":"4a3bf9a65e3bb578ad5833003d6c8978888199e3","ton-block-json":"e09628f01f93569fad7e5c7125cd9af1d0a5a1c9","ton-executor":"d716818545b287e04dfad21ddc317a5ea389e621","ton-types":"007da5416f1508fdd5fd23be8099a5e0f06f564e","ton-vm":"214b50588c50fdbd3939b87ba87d77a0b3c43777"}
+{"adnl":"3713f1f77cfc0420e91b696574befe113d94914e","dht":"46d66350b7def07ecad5be08590fe9b84e0f59a4","ever-crypto":"04933eeea4a3e1988c1d6c788918be2599cbc1e5","overlay":"4b2108b0132455faf348c783bf4405586294b7a5","rldp":"4f8727510a0c497668e23478b095f1a07baad548","ton-labs-abi":"ed3f54ffeb646ba9fe86bd69cc19c9d62a752426","ton-tl":"a46df37d842301bc2d43549334022dfa20903760","ton-block":"e40e2ed3f39de5e40cbc5383f691b0a8d8c07de1","ton-block-json":"25cba771beb767d89973b225d3fbe263ce2cc254","ton-executor":"9dc29791c50c896396ff9c9e0a980f8a0aff35e1","ton-types":"007da5416f1508fdd5fd23be8099a5e0f06f564e","ton-vm":"a3530fddcd4cb170cceace2bd545bf82a29081de"}

recomended_rust

@@ -1 +1 @@
-1.57.0
+1.58.1

src/boot.rs

@@ -15,7 +15,7 @@ use crate::{
     CHECK, block::BlockStuff, block_proof::BlockProofStuff, engine_traits::EngineOperations, 
     shard_state::ShardStateStuff, engine::Engine
 };
-use adnl::common::KeyId;
+use ever_crypto::KeyId;
 use std::{ops::Deref, sync::Arc, time::Duration};
 use storage::block_handle_db::BlockHandle;
 use ton_block::{BlockIdExt, ShardIdent, SHARD_FULL};