diff --git a/Cargo.toml b/Cargo.toml index 97c9ccad..ed5a0a68 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,101 +1,92 @@ -# -# Copyright 2018-2019 TON DEV SOLUTIONS LTD. -# -# Licensed under the SOFTWARE EVALUATION License (the "License"); you may not use -# this file except in compliance with the License. You may obtain a copy of the -# License at: -# -# https://www.ton.dev/licenses -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific TON DEV software governing permissions and limitations -# under the License. -# + [package] -name = "ton_node" -version = "0.47.83" -edition = "2018" + +name = 'ton_node' +version = '0.47.83' +edition = '2018' [workspace] + members = [ - "storage" + 'storage', ] [dependencies] -async-trait = "0.1.22" -base64 = "0.11.0" -bincode = "1.2.1" -bitflags = "1.2.1" -crossbeam-channel = "0.4.2" -clap = "2.33.1" -chrono = "0.4.10" -colored = "1.9.3" -dirs = "2.0.2" -env_logger = "0.7.1" -failure = "0.1.6" -futures = "0.3.1" -futures-timer = "3.0.1" -hex = "0.4.1" -lazy_static = "1.4.0" -log = "0.4" -log4rs = "1" -log4rs-rolling-file = "0.2.0" -num-bigint = "0.2.2" -openssl = "0.10.35" -pretty_assertions = "0.6.1" -rand = "0.7.3" -regex = "^1.3.0" -rocksdb = "0.15.0" -rustracing = { version = "0.4.0", optional = true } -rustracing_jaeger = { version = "0.4.1", optional = true } -serde = "1.0.105" -serde_derive = "1.0.105" -serde_json = "1.0.64" -sha2 = "^0.8" -spin = "0.7.1" -statsd = { version = "0.14.0", optional = true } -stream-cancel = "0.8.0" -string-builder = "^0.2.0" -tokio = { version = "1.5.0", features = ["rt-multi-thread"] } -adnl = { git = "https://github.com/tonlabs/ton-labs-adnl", features = ["client", "node", "server"] } -catchain = { path = "catchain" } -dht = { git = "https://github.com/tonlabs/ton-labs-dht" } -lockfree = { git = "https://github.com/tonlabs/lockfree.git" } -overlay = { git = "https://github.com/tonlabs/ton-labs-overlay" } -rldp = { git = "https://github.com/tonlabs/ton-labs-rldp" } -storage = { path = "storage" } -ton_abi = { git = "https://github.com/tonlabs/ton-labs-abi.git" } -ton_api = { git = "https://github.com/tonlabs/ton-labs-tl", package = "ton_api" } -ton_block = { git = "https://github.com/tonlabs/ton-labs-block" } -ton_block_json = { git = "https://github.com/tonlabs/ton-labs-block-json.git" } -ton_executor = { git = "https://github.com/tonlabs/ton-labs-executor" } -ton_types = { git = "https://github.com/tonlabs/ton-labs-types" } -ton_vm = { git = "https://github.com/tonlabs/ton-labs-vm" } -validator_session = { path = "validator-session" } +async-trait = '0.1.22' +base64 = '0.11.0' +bincode = '1.2.1' +bitflags = '1.2.1' +crossbeam-channel = '0.4.2' +clap = '2.33.1' +chrono = '0.4.10' +colored = '1.9.3' +dirs = '2.0.2' +env_logger = '0.7.1' +failure = '0.1.6' +futures = '0.3.1' +futures-timer = '3.0.1' +hex = '0.4.1' +lazy_static = '1.4.0' +log = '0.4' +log4rs = '1' +log4rs-rolling-file = '0.2.0' +num-bigint = '0.2.2' +openssl = '0.10.35' +pretty_assertions = '0.6.1' +rand = '0.7.3' +regex = '^1.3.0' +rocksdb = '0.15.0' +rustracing = { version = '0.4.0', optional = true } +rustracing_jaeger = { version = '0.4.1', optional = true } +serde = '1.0.105' +serde_derive = '1.0.105' +serde_json = '1.0.64' +sha2 = '^0.8' +spin = '0.7.1' +statsd = { version = '0.14.0', optional = true } +stream-cancel = '0.8.0' +string-builder = '^0.2.0' +tokio = { version = '1.5.0', features = [ 'rt-multi-thread' ] } +adnl = { git = 'https://github.com/tonlabs/ton-labs-adnl', features = [ 'client', 'node', 'server' ], tag = '0.7.53' } +catchain = { path = 'catchain' } +dht = { git = 'https://github.com/tonlabs/ton-labs-dht', tag = '0.5.47' } +lockfree = { git = 'https://github.com/tonlabs/lockfree.git' } +overlay = { git = 'https://github.com/tonlabs/ton-labs-overlay', tag = '0.6.34' } +rldp = { git = 'https://github.com/tonlabs/ton-labs-rldp', tag = '0.7.49' } +storage = { path = 'storage' } +ton_abi = { git = 'https://github.com/tonlabs/ton-labs-abi.git', tag = '2.1.1' } +ton_api = { git = 'https://github.com/tonlabs/ton-labs-tl', package = 'ton_api', tag = '0.2.110' } +ton_block = { git = 'https://github.com/tonlabs/ton-labs-block', tag = '1.7.27' } +ton_block_json = { git = 'https://github.com/tonlabs/ton-labs-block-json.git', tag = '0.6.24' } +ton_executor = { git = 'https://github.com/tonlabs/ton-labs-executor', tag = '1.15.31' } +ton_types = { git = 'https://github.com/tonlabs/ton-labs-types', tag = '1.10.10' } +ton_vm = { git = 'https://github.com/tonlabs/ton-labs-vm', tag = '1.8.19' } +validator_session = { path = 'validator-session' } [target.'cfg(windows)'.dependencies.rdkafka] -version = "0.26.0" -features = ["cmake_build"] + +version = '0.26.0' +features = [ 'cmake_build' ] optional = true [target.'cfg(unix)'.dependencies.rdkafka] -version = "0.26.0" + +version = '0.26.0' optional = true [dev-dependencies] [features] -default = ["telemetry"] -validator = ["async_collator", "async_validator", "slashing"] -external_db = ["rdkafka"] -async_collator = [] -async_validator = [] -ci_run = [] -compression = ["overlay/compression", "rldp/compression"] -metrics = ["statsd"] -read_old_db = [] -slashing = [] -telemetry = ["adnl/telemetry", "dht/telemetry", "rldp/telemetry", "overlay/telemetry", "storage/telemetry"] + +default = [ 'telemetry' ] +validator = [ 'async_collator', 'async_validator', 'slashing' ] +external_db = [ 'rdkafka' ] +async_collator = [ ] +async_validator = [ ] +ci_run = [ ] +compression = [ 'overlay/compression', 'rldp/compression' ] +metrics = [ 'statsd' ] +read_old_db = [ ] +slashing = [ ] +telemetry = [ 'adnl/telemetry', 'dht/telemetry', 'rldp/telemetry', 'overlay/telemetry', 'storage/telemetry' ] diff --git a/catchain/Cargo.toml b/catchain/Cargo.toml index 3901ebb4..86757f1c 100644 --- a/catchain/Cargo.toml +++ b/catchain/Cargo.toml @@ -1,34 +1,36 @@ + [package] -edition = "2018" -build = "../common/build/build.rs" -name = "catchain" -version = "0.1.0" + +edition = '2018' +build = '../common/build/build.rs' +name = 'catchain' +version = '0.1.0' [dependencies] -# external -sha2 = "^0.8" -base64 = "0.11.0" -log = "0.4.8" -hex = "0.3.1" -adnl = { git = "https://github.com/tonlabs/ton-labs-adnl", features = ["node"] } -overlay = { git = "https://github.com/tonlabs/ton-labs-overlay" } -rldp = { git = "https://github.com/tonlabs/ton-labs-rldp" } -storage = { path = "../storage" } -ton_types = { git = "https://github.com/tonlabs/ton-labs-types" } -ton_api = { git = "https://github.com/tonlabs/ton-labs-tl", package = "ton_api" } -tokio = { version = "1.3.0", features = ["rt-multi-thread"] } -futures = "0.3.4" -crossbeam = "0.7.3" -rand = "0.7.3" -failure = "0.1.1" -regex = "1.3.1" -chrono = "0.4.10" -metrics-core = "0.5.2" -metrics-runtime = "0.13.0" -ed25519-dalek = "1.0.0-pre.4" -lazy_static = "1.4.0" +sha2 = '^0.8' +base64 = '0.11.0' +log = '0.4.8' +hex = '0.3.1' +adnl = { git = 'https://github.com/tonlabs/ton-labs-adnl', features = [ 'node' ], tag = '0.7.53' } +overlay = { git = 'https://github.com/tonlabs/ton-labs-overlay', tag = '0.6.34' } +rldp = { git = 'https://github.com/tonlabs/ton-labs-rldp', tag = '0.7.49' } +storage = { path = '../storage' } +ton_types = { git = 'https://github.com/tonlabs/ton-labs-types', tag = '1.10.10' } +ton_api = { git = 'https://github.com/tonlabs/ton-labs-tl', package = 'ton_api', tag = '0.2.110' } +tokio = { version = '1.3.0', features = [ 'rt-multi-thread' ] } +futures = '0.3.4' +crossbeam = '0.7.3' +rand = '0.7.3' +failure = '0.1.1' +regex = '1.3.1' +chrono = '0.4.10' +metrics-core = '0.5.2' +metrics-runtime = '0.13.0' +ed25519-dalek = '1.0.0-pre.4' +lazy_static = '1.4.0' [dev-dependencies] -env_logger = "0.7.1" -chrono = "0.4.10" + +env_logger = '0.7.1' +chrono = '0.4.10' diff --git a/common b/common index 98bca079..e4f1fb8d 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 98bca079f4eb44148e2b0ed35c549b0ba3bde993 +Subproject commit e4f1fb8dca09dc63657dc9d2cf0db422996307ee diff --git a/storage/Cargo.toml b/storage/Cargo.toml index ee8f78f5..3b53f125 100644 --- a/storage/Cargo.toml +++ b/storage/Cargo.toml @@ -1,41 +1,46 @@ + [package] -name = "storage" -version = "0.5.0" -edition = "2018" + +name = 'storage' +version = '0.5.0' +edition = '2018' [dependencies] -async-trait = "0.1.31" -base64 = "0.12.2" -failure = "0.1.6" -fnv = "1.0.6" -futures = "0.3.4" -hex = "0.4.2" -lazy_static = "1.4.0" -log = "0.4.11" -log4rs = "1" -rocksdb = "0.15.0" -regex = "1.3.9" -serde = "1.0.114" -serde_cbor = "0.11.1" -serde_derive = "1.0.114" -sha2 = "^0.8" -strum = "0.18.0" -strum_macros = "0.18.0" -tokio = { version = "1.3.0", features = ["fs", "rt-multi-thread"] } -rand = "0.7.3" - -adnl = { git = "https://github.com/tonlabs/ton-labs-adnl" } -lockfree = { git = "https://github.com/tonlabs/lockfree.git" } -ton_api = { git = "https://github.com/tonlabs/ton-labs-tl", package = "ton_api" } -ton_block = { git = "https://github.com/tonlabs/ton-labs-block" } -ton_types = { git = "https://github.com/tonlabs/ton-labs-types" } + +async-trait = '0.1.31' +base64 = '0.12.2' +failure = '0.1.6' +fnv = '1.0.6' +futures = '0.3.4' +hex = '0.4.2' +lazy_static = '1.4.0' +log = '0.4.11' +log4rs = '1' +rocksdb = '0.15.0' +regex = '1.3.9' +serde = '1.0.114' +serde_cbor = '0.11.1' +serde_derive = '1.0.114' +sha2 = '^0.8' +strum = '0.18.0' +strum_macros = '0.18.0' +tokio = { version = '1.3.0', features = [ 'fs', 'rt-multi-thread' ] } +rand = '0.7.3' +adnl = { git = 'https://github.com/tonlabs/ton-labs-adnl', tag = '0.7.53' } +lockfree = { git = 'https://github.com/tonlabs/lockfree.git' } +ton_api = { git = 'https://github.com/tonlabs/ton-labs-tl', package = 'ton_api', tag = '0.2.110' } +ton_block = { git = 'https://github.com/tonlabs/ton-labs-block', tag = '1.7.27' } +ton_types = { git = 'https://github.com/tonlabs/ton-labs-types', tag = '1.10.10' } [dev-dependencies] -log4rs = "1" + +log4rs = '1' [build-dependencies.cc] -version = "=1.0.61" -features = ["parallel"] + +version = '=1.0.61' +features = [ 'parallel' ] [features] -telemetry = [] + +telemetry = [ ] diff --git a/validator-session/Cargo.toml b/validator-session/Cargo.toml index 8576c931..c074a8a2 100644 --- a/validator-session/Cargo.toml +++ b/validator-session/Cargo.toml @@ -1,29 +1,32 @@ + [package] -edition = "2018" -build = "../common/build/build.rs" -name = "validator_session" -version = "0.0.1" + +edition = '2018' +build = '../common/build/build.rs' +name = 'validator_session' +version = '0.0.1' [dependencies] -# external -catchain = { path = "../catchain" } -sha2 = "^0.8" -log = "0.4.8" -hex = "0.3.1" -ton_block = { git = "https://github.com/tonlabs/ton-labs-block" } -ton_types = { git = "https://github.com/tonlabs/ton-labs-types" } -ton_api = { git = "https://github.com/tonlabs/ton-labs-tl", package = "ton_api" } -adnl = { git = "https://github.com/tonlabs/ton-labs-adnl", features = ["node"] } -rand = "0.7.3" -crossbeam = "0.7.3" -failure = "0.1.1" -crc32c = "0.4.0" -lazy_static = "1.4.0" -metrics-core = "0.5.2" -metrics-runtime = "0.13.0" -backtrace = "0.3.54" + +catchain = { path = '../catchain' } +sha2 = '^0.8' +log = '0.4.8' +hex = '0.3.1' +ton_block = { git = 'https://github.com/tonlabs/ton-labs-block', tag = '1.7.27' } +ton_types = { git = 'https://github.com/tonlabs/ton-labs-types', tag = '1.10.10' } +ton_api = { git = 'https://github.com/tonlabs/ton-labs-tl', package = 'ton_api', tag = '0.2.110' } +adnl = { git = 'https://github.com/tonlabs/ton-labs-adnl', features = [ 'node' ], tag = '0.7.53' } +rand = '0.7.3' +crossbeam = '0.7.3' +failure = '0.1.1' +crc32c = '0.4.0' +lazy_static = '1.4.0' +metrics-core = '0.5.2' +metrics-runtime = '0.13.0' +backtrace = '0.3.54' [dev-dependencies] -env_logger = "0.7.1" -chrono = "0.4.10" -colored = "1.9.3" + +env_logger = '0.7.1' +chrono = '0.4.10' +colored = '1.9.3'