Merge pull request #236 from everx-labs/renaming

Crates and repos renaming; repo ever_types merged into repo ever_block

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file.
 
+## Version 0.58.2
+
+- Repo ever_types merged into repo ever_block
+
+## Version 0.58.0
+
+- The crate was renamed from `ton_node` to `ever-node`
+- Supported renaming of other crates
+
 ## Version 0.57.0
 
 - Shadow SMFT is prepared for first deployment

Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 build = 'common/build/build.rs'
 edition = '2021'
-name = 'ton_node'
-version = '0.57.0'
+name = 'ever-node'
+version = '0.58.2'
 
 [workspace]
 members = [ 'storage' ]
@@ -86,17 +86,16 @@ stream-cancel = '0.8.0'
 string-builder = '^0.2.0'
 tokio = { features = [ 'rt-multi-thread' ], version = '1.5' }
 tokio-util = '0.7'
-adnl = { features = [ 'client', 'node', 'server' ], git = 'https://github.com/tonlabs/ever-adnl.git', tag = '0.10.15' }
+adnl = { features = [ 'client', 'node', 'server' ], git = 'https://github.com/everx-labs/ever-adnl.git', tag = '0.10.22' }
 catchain = { path = 'catchain' }
-lockfree = { git = 'https://github.com/tonlabs/lockfree.git' }
+ever_abi = { git = 'https://github.com/everx-labs/ever-abi.git', tag = '2.5.1' }
+ever_block = { git = 'https://github.com/everx-labs/ever-block.git', tag = '1.10.0' }
+ever_block_json = { git = 'https://github.com/everx-labs/ever-block-json.git', tag = '0.8.3' }
+ever_executor = { git = 'https://github.com/everx-labs/ever-executor.git', tag = '1.17.3' }
+ever_vm = { git = 'https://github.com/everx-labs/ever-vm.git', tag = '2.1.2' }
+lockfree = { git = 'https://github.com/everx-labs/lockfree.git' }
 storage = { path = 'storage' }
-ton_abi = { git = 'https://github.com/tonlabs/ever-abi.git', tag = '2.4.25' }
-ton_api = { git = 'https://github.com/tonlabs/ever-tl.git', package = 'ton_api', tag = '0.3.72' }
-ton_block = { git = 'https://github.com/tonlabs/ever-block.git', tag = '1.9.141' }
-ton_block_json = { git = 'https://github.com/tonlabs/ever-block-json.git', tag = '0.7.231' }
-ton_executor = { git = 'https://github.com/tonlabs/ever-executor.git', tag = '1.16.122' }
-ton_types = { git = 'https://github.com/tonlabs/ever-types.git', tag = '2.0.39' }
-ton_vm = { git = 'https://github.com/tonlabs/ever-vm.git', tag = '1.9.22' }
+ton_api = { git = 'https://github.com/everx-labs/ever-tl.git', package = 'ton_api', tag = '0.3.77' }
 validator_session = { path = 'validator-session' }
 
 [dev-dependencies]
@@ -108,20 +107,20 @@ pretty_assertions = '1.3'
 tokio = { features = [ 'macros' ], version = '1.5' }
 
 [features]
-default = [ 'telemetry', 'ton_types/export_key' ]
-export_key = [ 'catchain/export_key', 'ton_types/export_key' ]
+default = [ 'telemetry', 'ever_block/export_key' ]
+export_key = [ 'catchain/export_key', 'ever_block/export_key' ]
 external_db = [ 'rdkafka' ]
 fast_finality_extra = [  ]
-gosh = [ 'ton_block/gosh', 'ton_vm/gosh' ]
+gosh = [ 'ever_block/gosh', 'ever_vm/gosh' ]
 log_metrics = [  ]
 prometheus = [ 'metrics-exporter-prometheus', 'log_metrics' ]
-signature_with_id = [ 'ton_block/signature_with_id', 'ton_vm/signature_with_id', 'ton_executor/signature_with_id' ]
+signature_with_id = [ 'ever_block/signature_with_id', 'ever_vm/signature_with_id', 'ever_executor/signature_with_id' ]
 slashing = [ 'validator_session/slashing' ]
 statsd = [ 'metrics-exporter-statsd', 'log_metrics', 'dep:statsd' ]
 telemetry = [ 'adnl/telemetry', 'storage/telemetry' ]
 trace_alloc = [  ]
 trace_alloc_detail = [ 'trace_alloc' ]
-verification = [ 'ton_types/export_key' ]
+verification = [ 'ever_block/export_key' ]
 
 [profile]
 

README.md

@@ -46,7 +46,7 @@ cargo test --release -- --nocapture --test-threads=1
 
 To get help about command line arguments, run
 ```
-ton_node --help
+ever-node --help
 ```
 
 ## Everscale/Venom Console Usage

bin/adnl_ping.rs

@@ -1,13 +1,13 @@
 /*
-* Copyright (C) 2019-2021 TON Labs. All Rights Reserved.
+* Copyright (C) 2019-2024 EverX. All Rights Reserved.
 *
 * Licensed under the SOFTWARE EVALUATION License (the "License"); you may not use
 * this file except in compliance with the License.
 *
 * 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
+* See the License for the specific EVERX DEV software governing permissions and
 * limitations under the License.
 */
 
@@ -20,8 +20,8 @@ use std::{convert::TryInto, env, fs::File, io::BufReader, sync::Arc};
 use ton_api::ton::{TLObject, rpc::ton_node::GetCapabilities};
 #[cfg(feature = "telemetry")]
 use ton_api::tag_from_boxed_type;
-use ton_node::config::TonNodeGlobalConfigJson;
-use ton_types::{error, fail, base64_decode, Ed25519KeyOption, Result};
+use ever_node::config::TonNodeGlobalConfigJson;
+use ever_block::{error, fail, base64_decode, Ed25519KeyOption, Result};
 
 include!("../common/src/test.rs");
 

bin/adnl_resolve.rs

@@ -1,21 +1,21 @@
 /*
-* Copyright (C) 2019-2022 TON Labs. All Rights Reserved.
+* Copyright (C) 2019-2024 EverX. All Rights Reserved.
 *
 * Licensed under the SOFTWARE EVALUATION License (the "License"); you may not use
 * this file except in compliance with the License.
 *
 * 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
+* See the License for the specific EVERX DEV software governing permissions and
 * limitations under the License.
 */
 
 use adnl::node::{AdnlNode, AdnlNodeConfig};
 use adnl::{DhtNode, DhtSearchPolicy};
 use std::{convert::TryInto, env, fs::File, io::BufReader};
-use ton_node::config::TonNodeGlobalConfigJson;
-use ton_types::{error, fail, base64_decode, KeyId, Result};
+use ever_node::config::TonNodeGlobalConfigJson;
+use ever_block::{error, fail, base64_decode, KeyId, Result};
 
 include!("../common/src/test.rs");
 

bin/console.rs

@@ -1,21 +1,27 @@
 /*
-* Copyright (C) 2019-2023 EverX. All Rights Reserved.
+* Copyright (C) 2019-2024 EverX. All Rights Reserved.
 *
 * Licensed under the SOFTWARE EVALUATION License (the "License"); you may not use
 * this file except in compliance with the License.
 *
 * 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
+* See the License for the specific EVERX DEV software governing permissions and
 * limitations under the License.
 */
 
 use adnl::{
     common::TaggedTlObject, client::{AdnlClient, AdnlClientConfig, AdnlClientConfigJson}
 };
+use ever_abi::{Contract, Token, TokenValue, Uint};
+use ever_block::{
+    error, fail, AccountStatus, base64_decode, base64_encode, BlockIdExt, BuilderData, 
+    Deserializable, Ed25519KeyOption, Result, Serializable, ShardAccount, SliceData, 
+    UInt256, write_boc
+};
+use ever_block_json::parse_state;
 use std::{collections::HashMap, convert::TryInto, env, str::FromStr, time::Duration};
-use ton_abi::{Contract, Token, TokenValue, Uint};
 use ton_api::{
     serialize_boxed,
     ton::{
@@ -26,13 +32,6 @@ use ton_api::{
 };
 #[cfg(feature = "telemetry")]
 use ton_api::tag_from_bare_object;
-use ton_block::{
-    AccountStatus, Deserializable, BlockIdExt, Serializable, ShardAccount
-};
-use ton_types::{
-    error, fail, base64_decode, base64_encode, BuilderData, Ed25519KeyOption, Result, 
-    SliceData, UInt256, write_boc
-};
 
 include!("../common/src/test.rs");
 
@@ -626,7 +625,7 @@ impl ControlClient {
         let body = BuilderData::with_raw(data, len)?;
         let body = body.into_cell()?;
         log::trace!("message body {}", body);
-        let data = ton_types::write_boc(&body)?;
+        let data = write_boc(&body)?;
         let path = params.next().map(
             |path| path.to_string()).unwrap_or("recover-query.boc".to_string()
         );
@@ -780,7 +779,7 @@ impl ControlClient {
             body
         };
         log::trace!("message body {}", body);
-        let data = ton_types::write_boc(&body)?;
+        let data = write_boc(&body)?;
         let path = params.next().map(
             |path| path.to_string()).unwrap_or("validator-query.boc".to_string()
         );
@@ -808,7 +807,7 @@ impl ControlClient {
         let zerostate = 
             serde_json::from_str::<serde_json::Map<String, serde_json::Value>>(&zerostate)
                 .map_err(|err| error!("Can't parse read zerostate json file: {}", err))?;
-        let zerostate = ton_block_json::parse_state(&zerostate)
+        let zerostate = parse_state(&zerostate)
             .map_err(|err| error!("Can't parse read zerostate json file: {}", err))?;
 
         let key = SliceData::load_builder(index.write_to_new_cell()?)?;
@@ -941,12 +940,12 @@ mod test {
     use serde_json::json;
     use storage::block_handle_db::BlockHandle;
     use ton_api::deserialize_boxed;
-    use ton_block::{
+    use ever_block::{
         generate_test_account_by_init_code_hash,
         BlockLimits, ConfigParam0, ConfigParam34, ConfigParamEnum, McStateExtra, ParamLimits, 
         ShardIdent, ShardStateUnsplit, ValidatorDescr, ValidatorSet
     };
-    use ton_node::{
+    use ever_node::{
         collator_test_bundle::{create_engine_telemetry, create_engine_allocated},
         config::TonNodeConfig, engine_traits::{EngineAlloc, EngineOperations},
         internal_db::{InternalDbConfig, InternalDb, state_gc_resolver::AllowStateGcSmartResolver}, 
@@ -955,7 +954,7 @@ mod test {
         validator::validator_manager::ValidationStatus, shard_states_keeper::PinnedShardStateGuard,
     };
     #[cfg(feature = "telemetry")]
-    use ton_node::engine_traits::EngineTelemetry;
+    use ever_node::engine_traits::EngineTelemetry;
 
     const CFG_DIR: &str = "./target";
     const CFG_NODE_FILE: &str = "light_node.json";
@@ -987,7 +986,7 @@ mod test {
                 &ShardAccount::with_params(&account, UInt256::default(), 0).unwrap()
             ).unwrap();
             let cell = ss.serialize().unwrap();
-            let bytes = ton_types::write_boc(&cell).unwrap();
+            let bytes = write_boc(&cell).unwrap();
             let shard_state_id = BlockIdExt::with_params(
                 ShardIdent::full(0),
                 0,
@@ -1025,7 +1024,7 @@ mod test {
             ss.write_custom(Some(&ms)).unwrap();
 
             let cell = ss.serialize().unwrap();
-            let bytes = ton_types::write_boc(&cell).unwrap();
+            let bytes = write_boc(&cell).unwrap();
             let master_state_id = BlockIdExt::with_params(
                 ShardIdent::masterchain(),
                 0,

bin/dhtscan.rs

@@ -1,22 +1,22 @@
 /*
-* Copyright (C) 2019-2021 TON Labs. All Rights Reserved.
+* Copyright (C) 2019-2024 EverX. All Rights Reserved.
 *
 * Licensed under the SOFTWARE EVALUATION License (the "License"); you may not use
 * this file except in compliance with the License.
 *
 * 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
+* See the License for the specific EVERX DEV software governing permissions and
 * limitations under the License.
 */
 
 use adnl::node::{AdnlNode, AdnlNodeConfig};
 use adnl::DhtNode;
 use adnl::OverlayNode;
 use std::{collections::HashMap, env, fs::File, io::BufReader, ops::Deref, sync::Arc};
-use ton_node::config::TonNodeGlobalConfigJson;
-use ton_types::{error, fail, base64_encode, KeyOption, Result};
+use ever_node::config::TonNodeGlobalConfigJson;
+use ever_block::{error, fail, base64_encode, KeyOption, Result};
 
 include!("../common/src/test.rs");
 

bin/gendht.rs

@@ -1,20 +1,20 @@
 /*
-* Copyright (C) 2019-2021 TON Labs. All Rights Reserved.
+* Copyright (C) 2019-2024 EverX. All Rights Reserved.
 *
 * Licensed under the SOFTWARE EVALUATION License (the "License"); you may not use
 * this file except in compliance with the License.
 *
 * 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
+* See the License for the specific EVERX DEV software governing permissions and
 * limitations under the License.
 */
 
 use adnl::{adnl_node_test_key, adnl_node_test_config, node::{AdnlNode, AdnlNodeConfig}};
 use adnl::DhtNode;
 use std::{env, ops::Deref, sync::Arc};
-use ton_types::{error, base64_encode, KeyOption, Result};
+use ever_block::{error, base64_encode, KeyOption, Result};
 
 async fn gen(ip: &str, dht_key_enc: &str) -> Result<()> {
     let config = AdnlNodeConfig::from_json(

bin/keygen.rs

@@ -1,17 +1,17 @@
 /*
-* Copyright (C) 2019-2021 TON Labs. All Rights Reserved.
+* Copyright (C) 2019-2024 EverX. All Rights Reserved.
 *
 * Licensed under the SOFTWARE EVALUATION License (the "License"); you may not use
 * this file except in compliance with the License.
 *
 * 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
+* See the License for the specific EVERX DEV software governing permissions and
 * limitations under the License.
 */
 
-use ton_types::{base64_decode, base64_encode, Ed25519KeyOption, Result};
+use ever_block::{base64_decode, base64_encode, Ed25519KeyOption, Result};
 
 fn gen() -> Result<()> {
     let (private, public) = Ed25519KeyOption::generate_with_json()?;

bin/keyid.rs

@@ -1,18 +1,18 @@
 /*
-* Copyright (C) 2019-2021 TON Labs. All Rights Reserved.
+* Copyright (C) 2019-2024 EverX. All Rights Reserved.
 *
 * Licensed under the SOFTWARE EVALUATION License (the "License"); you may not use
 * this file except in compliance with the License.
 *
 * 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
+* See the License for the specific EVERX DEV software governing permissions and
 * limitations under the License.
 */
 
 use std::{convert::TryInto, env};
-use ton_types::{error, fail, base64_decode, base64_encode, Ed25519KeyOption, Result};
+use ever_block::{error, fail, base64_decode, base64_encode, Ed25519KeyOption, Result};
 
 fn compute(typ: &str, key: &str) -> Result<()> {
     let key_bin = base64_decode(key)?;