From b8759c3d3140f508e628fe025cd4763487b6121f Mon Sep 17 00:00:00 2001 From: Alexey Danilevich Date: Fri, 17 May 2024 10:34:05 +0300 Subject: [PATCH] 1.46.1 (#1050) * Rebranding ton_* -> ever_* Remove types as dependency * Update lock file * Fix build errors * Try to fix wasm * Revert "Try to fix wasm" This reverts commit 7a14c7444c03af0f60fc20b9e0f1052c8e8b551c. * Refresh dependencies * Supported a common message * Update changelog and Cargo.lock --------- Co-authored-by: Slava Co-authored-by: Sumrachek --- CHANGELOG.md | 26 +- Cargo.lock | 1081 ++++++++--------- README.md | 38 +- api/derive/Cargo.toml | 4 +- api/info/Cargo.toml | 4 +- api/test/Cargo.toml | 4 +- docs/SUMMARY.md | 8 +- docs/add_to_backend.md | 20 +- .../configuration/endpoint-configuration.md | 2 +- .../installation/add_sdk_to_your_app.md | 4 +- .../aggregate_collection.md | 2 +- .../data-pagination.md | 2 +- .../query_collection.md | 4 +- .../queries_and_subscriptions/raw_query.md | 2 +- .../subscribe_to_updates.md | 2 +- .../add_contract_to_your_app.md | 4 +- .../work_with_contracts/custom_giver.md | 8 +- .../work_with_contracts/decode_message.md | 4 +- docs/guides/work_with_contracts/deploy.md | 18 +- .../emulate_transaction.md | 6 +- .../work_with_contracts/estimate_fees.md | 4 +- .../work_with_contracts/external_signing.md | 4 +- .../work_with_contracts/monitor-messages.md | 4 +- .../work_with_contracts/run_abi_get_method.md | 6 +- .../run_fift_get_method.md | 2 +- .../guides/work_with_contracts/run_onchain.md | 12 +- .../trace-message-processing-with-remp.md | 4 +- .../validate_address_convert_address.md | 2 +- .../work_with_contracts/work_with_events.md | 6 +- docs/quick_start.md | 20 +- docs/reference/error_codes.md | 2 +- .../src/ton_client/abi/decode_data.rs.html | 2 +- .../src/ton_client/abi/decode_message.rs.html | 10 +- .../src/ton_client/abi/encode_account.rs.html | 6 +- .../src/ton_client/abi/encode_message.rs.html | 12 +- .../src/ton_client/abi/internal.rs.html | 4 +- .../rust-api/src/ton_client/abi/types.rs.html | 6 +- .../ton_client/boc/blockchain_config.rs.html | 12 +- .../rust-api/src/ton_client/boc/cache.rs.html | 6 +- .../src/ton_client/boc/encode.rs.html | 2 +- .../src/ton_client/boc/internal.rs.html | 26 +- .../rust-api/src/ton_client/boc/parse.rs.html | 46 +- .../rust-api/src/ton_client/boc/tvc.rs.html | 2 +- .../src/ton_client/client/client.rs.html | 2 +- .../src/ton_client/debot/calltype.rs.html | 4 +- .../src/ton_client/debot/dengine.rs.html | 2 +- .../src/ton_client/debot/helpers.rs.html | 4 +- .../ton_client/debot/json_interface.rs.html | 2 +- .../ton_client/debot/msg_interface.rs.html | 2 +- .../src/ton_client/debot/run_output.rs.html | 2 +- .../rust-api/src/ton_client/encoding.rs.html | 4 +- .../rust-api/src/ton_client/error.rs.html | 2 +- .../ton_client/net/iterators/block.rs.html | 2 +- .../iterators/block_iterator/branch.rs.html | 2 +- .../iterators/block_iterator/filter.rs.html | 2 +- .../net/iterators/block_iterator/mod.rs.html | 2 +- .../processing/blocks_walking.rs.html | 4 +- .../src/ton_client/processing/errors.rs.html | 2 +- .../ton_client/processing/fetching.rs.html | 2 +- .../ton_client/processing/internal.rs.html | 2 +- .../processing/send_message.rs.html | 4 +- .../processing/wait_for_transaction.rs.html | 2 +- .../src/ton_client/tvm/call_tvm.rs.html | 30 +- .../ton_client/tvm/check_transaction.rs.html | 6 +- .../src/ton_client/tvm/errors.rs.html | 4 +- .../src/ton_client/tvm/run_get.rs.html | 6 +- .../src/ton_client/tvm/run_message.rs.html | 6 +- .../rust-api/src/ton_client/tvm/stack.rs.html | 8 +- .../rust-api/src/ton_client/tvm/types.rs.html | 2 +- .../ton_client/utils/calc_storage_fee.rs.html | 2 +- .../src/ton_client/utils/conversion.rs.html | 4 +- docs/reference/types-and-methods/mod_abi.md | 2 +- docs/reference/types-and-methods/mod_boc.md | 4 +- docs/reference/types-and-methods/modules.md | 2 +- examples/README.md | 2 +- ton_client/Cargo.toml | 23 +- ton_client/build.rs | 2 +- ton_client/src/abi/decode_boc.rs | 8 +- ton_client/src/abi/decode_data.rs | 2 +- ton_client/src/abi/decode_message.rs | 22 +- ton_client/src/abi/encode_account.rs | 2 +- ton_client/src/abi/encode_boc.rs | 6 +- ton_client/src/abi/encode_message.rs | 14 +- ton_client/src/abi/errors.rs | 2 +- ton_client/src/abi/init_data.rs | 14 +- ton_client/src/abi/internal.rs | 10 +- ton_client/src/abi/tests.rs | 14 +- ton_client/src/abi/types.rs | 10 +- ton_client/src/boc/blockchain_config.rs | 12 +- ton_client/src/boc/cache.rs | 2 +- ton_client/src/boc/encode.rs | 4 +- .../src/boc/encode_external_in_message.rs | 4 +- ton_client/src/boc/internal.rs | 30 +- ton_client/src/boc/parse.rs | 50 +- ton_client/src/boc/reader/query.rs | 4 +- ton_client/src/boc/state_init.rs | 6 +- ton_client/src/boc/tests.rs | 8 +- ton_client/src/boc/tvc.rs | 6 +- ton_client/src/client/client.rs | 2 +- ton_client/src/client/client_env_tests.rs | 2 +- ton_client/src/crypto/tests.rs | 8 +- ton_client/src/debot/calltype.rs | 8 +- ton_client/src/debot/dengine.rs | 2 +- ton_client/src/debot/dinterface.rs | 4 +- ton_client/src/debot/helpers.rs | 4 +- ton_client/src/debot/json_interface.rs | 2 +- ton_client/src/debot/json_lib_utils.rs | 2 +- ton_client/src/debot/msg_interface.rs | 2 +- ton_client/src/debot/run_output.rs | 2 +- ton_client/src/encoding.rs | 4 +- ton_client/src/error.rs | 2 +- ton_client/src/json_interface/interop.rs | 2 +- ton_client/src/net/iterators/block.rs | 2 +- .../net/iterators/block_iterator/branch.rs | 2 +- .../net/iterators/block_iterator/filter.rs | 2 +- .../src/net/iterators/block_iterator/mod.rs | 2 +- ton_client/src/net/network.rs | 6 +- ton_client/src/net/network_params.rs | 6 +- ton_client/src/net/server_link.rs | 2 +- ton_client/src/net/tests.rs | 6 +- ton_client/src/processing/blocks_walking.rs | 4 +- ton_client/src/processing/errors.rs | 2 +- ton_client/src/processing/fetching.rs | 2 +- ton_client/src/processing/internal.rs | 2 +- .../message_monitor_sdk_services.rs | 2 +- ton_client/src/processing/send_message.rs | 2 +- ton_client/src/processing/tests.rs | 4 +- .../src/processing/wait_for_transaction.rs | 2 +- ton_client/src/proofs/engine.rs | 10 +- ton_client/src/proofs/json.rs | 24 +- ton_client/src/proofs/mod.rs | 12 +- ton_client/src/proofs/tests/mod.rs | 6 +- ton_client/src/proofs/validators.rs | 4 +- .../tests/contracts/abi_v2/testDebot10.sol | 4 +- .../tests/contracts/abi_v2/testDebot11.sol | 12 +- .../tests/contracts/abi_v2/testDebot12.sol | 8 +- .../tests/contracts/abi_v2/testDebot14.sol | 10 +- .../tests/contracts/abi_v2/testDebot15.sol | 6 +- .../tests/contracts/abi_v2/testDebot16.sol | 4 +- .../tests/contracts/abi_v2/testDebot17.sol | 4 +- .../tests/contracts/abi_v2/testDebot18.sol | 4 +- .../tests/contracts/abi_v2/testDebot19.sol | 4 +- .../tests/contracts/abi_v2/testDebot20.sol | 10 +- .../tests/contracts/abi_v2/testDebot21.sol | 8 +- .../src/tests/contracts/abi_v2/testDebot3.sol | 12 +- .../src/tests/contracts/abi_v2/testDebot6.sol | 4 +- .../src/tests/contracts/abi_v2/testDebot8.sol | 6 +- ton_client/src/tests/test_misc.rs | 6 +- ton_client/src/tvm/call_tvm.rs | 22 +- ton_client/src/tvm/check_transaction.rs | 6 +- ton_client/src/tvm/errors.rs | 4 +- ton_client/src/tvm/run_get.rs | 6 +- ton_client/src/tvm/run_message.rs | 7 +- ton_client/src/tvm/stack.rs | 6 +- ton_client/src/tvm/tests.rs | 6 +- ton_client/src/tvm/types.rs | 4 +- ton_client/src/utils/calc_storage_fee.rs | 2 +- ton_client/src/utils/conversion.rs | 4 +- ton_client/src/utils/json.rs | 2 +- ton_client_processing/Cargo.toml | 7 +- .../src/message_monitor/message.rs | 2 +- .../src/sdk_services/mock_sdk_services.rs | 4 +- ton_client_processing/src/sdk_services/mod.rs | 2 +- ton_client_processing/src/tests.rs | 4 +- ton_sdk/Cargo.toml | 9 +- ton_sdk/src/contract.rs | 44 +- ton_sdk/src/json_helper.rs | 8 +- ton_sdk/src/lib.rs | 8 +- ton_sdk/src/message.rs | 8 +- ton_sdk/src/transaction.rs | 16 +- ton_sdk/src/types.rs | 4 +- toncli/Cargo.toml | 8 +- tools/api.json | 6 +- tools/update_trusted_blocks/Cargo.toml | 2 +- tools/update_trusted_blocks/src/main.rs | 12 +- 175 files changed, 1098 insertions(+), 1191 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c38fae6f..e7a5d9ae8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,18 @@ All notable changes to this project will be documented in this file. +## [1.46.1] – 2024-05-16 + +### New + +- Updated dependencies version + +- Removed ever-types from list of dependencies + +### Fixed + +- Some fixes in WASM build + ## [1.45.1] – 2023-12-19 ### Fixed @@ -104,7 +116,7 @@ State init should be finalized and ready to be used in message as is. - Message monitor buffers new messages for delayed start of the subscription. New subscription starts when 1 second has passed since the last addition or when 5 seconds has passed since last sending - Message monitor uses more than one subscription. -- Version of `ton_types` upped to 2.0.0 +- Version of `ever_block` upped to 2.0.0 - Fixed code for changed dependencies api - Removed logic related to client-server clock sync - `boc.encode_tvc` and `boc.decode_tvc` are renamed to `boc.encode_state_init` @@ -176,8 +188,8 @@ fallback scenario together with REMP statuses processing while REMP is not prope - `message_id` and `message_dst` fields are added to all `ProcessingEvent` variants - Config parameter `binding: { library: string, version: string }`. Binding authors should define this parameter at context initialization. -- `tonclient-binding-library` and `tonclient-binding-version` GraphQL request headers. [Read more here](https://github.com/tonlabs/ever-sdk/blob/master/docs/for-binding-developers/json_interface.md#bindings) -- `Error.data.binding_library` and `Error.data.binding_version` error data fields. [Read more here](https://github.com/tonlabs/ever-sdk/blob/master/docs/for-binding-developers/json_interface.md#bindings) +- `tonclient-binding-library` and `tonclient-binding-version` GraphQL request headers. [Read more here](https://github.com/everx-labs/ever-sdk/blob/master/docs/for-binding-developers/json_interface.md#bindings) +- `Error.data.binding_library` and `Error.data.binding_version` error data fields. [Read more here](https://github.com/everx-labs/ever-sdk/blob/master/docs/for-binding-developers/json_interface.md#bindings) ### Client breaking changes - `abi.get_signature_data` function ouput parameter `hash` is renamed to `unsigned` for consistency with other crypto functions parameters @@ -389,7 +401,7 @@ connection ### New - supported removing Copy interface from UInt256 -- supported changed interface of `ton_types::Cell` +- supported changed interface of `ever_block::Cell` ## [1.34.0] – 2022-05-18 @@ -627,7 +639,7 @@ from Graphql API. ### New - ABI v2.2 with fixed message body layout - supported. [See the specification](https://github.com/tonlabs/ton-labs-abi/blob/master/docs/ABI_2.2_spec.md) + supported. [See the specification](https://github.com/everx-labs/ton-labs-abi/blob/master/docs/ABI_2.2_spec.md) . Now, for contracts with ABI version < 2.2 compact layout will still be used for compatibility, for @@ -698,7 +710,7 @@ from Graphql API. ### Fixed -- Fixed problem with WASM binaries (https://github.com/tonlabs/ton-labs-types/pull/42) +- Fixed problem with WASM binaries (https://github.com/everx-labs/ton-labs-types/pull/42) ## [1.20.0] – 2021-07-16 @@ -921,7 +933,7 @@ from Graphql API. - [`tvm` module](docs/mod_tvm.md) functions download current blockchain configuration if `net` is initialized with DApp Server endpoints. - Otherwise, [default configuration](https://github.com/tonlabs/ton-executor/blob/11f46c416ebf1f145eacfb996587891a0a3cb940/src/blockchain_config.rs#L214) + Otherwise, [default configuration](https://github.com/everx-labs/ton-executor/blob/11f46c416ebf1f145eacfb996587891a0a3cb940/src/blockchain_config.rs#L214) is used. - **Debot Module**: - Support for debot invoking in Debot Engine. `send` browser callback is used not only for diff --git a/Cargo.lock b/Cargo.lock index fc0164757..9c0c7aa5a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -63,20 +63,20 @@ dependencies = [ [[package]] name = "ahash" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.15", "once_cell", "version_check", ] [[package]] name = "ahash" -version = "0.8.6" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if 1.0.0", "once_cell", @@ -86,9 +86,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -119,13 +119,13 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3" [[package]] name = "api_derive" -version = "1.45.1" +version = "1.46.1" dependencies = [ "api_info", "proc-macro2", @@ -136,7 +136,7 @@ dependencies = [ [[package]] name = "api_info" -version = "1.45.1" +version = "1.46.1" dependencies = [ "serde", "serde_derive", @@ -145,7 +145,7 @@ dependencies = [ [[package]] name = "api_test" -version = "1.45.1" +version = "1.46.1" dependencies = [ "api_derive", "api_info", @@ -156,9 +156,9 @@ dependencies = [ [[package]] name = "arc-swap" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "arrayref" @@ -188,26 +188,26 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.63", ] [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", @@ -247,9 +247,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64ct" @@ -274,9 +274,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "block-buffer" @@ -343,9 +343,9 @@ checksum = "b4ae4235e6dac0694637c763029ecea1a2ec9e4e06ec2729bd21ba4d9c863eb7" [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byteorder" @@ -355,18 +355,19 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -392,16 +393,16 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] @@ -443,9 +444,9 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "cookie" -version = "0.16.2" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" +checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24" dependencies = [ "percent-encoding", "time", @@ -454,12 +455,12 @@ dependencies = [ [[package]] name = "cookie_store" -version = "0.16.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d606d0fba62e13cf04db20536c05cb7f13673c161cb47a47a82b9b9e7d3f1daa" +checksum = "387461abbc748185c3a6e1673d826918b450b87ff22639429c694619a83b6cf6" dependencies = [ "cookie", - "idna 0.2.3", + "idna 0.3.0", "log", "publicsuffix", "serde", @@ -487,9 +488,9 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] @@ -505,9 +506,9 @@ dependencies = [ [[package]] name = "crc" -version = "3.0.1" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" dependencies = [ "crc-catalog", ] @@ -565,22 +566,9 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "3.2.0" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" -dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.5.1", - "subtle", - "zeroize", -] - -[[package]] -name = "curve25519-dalek" -version = "4.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" +checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" dependencies = [ "cfg-if 1.0.0", "cpufeatures", @@ -601,14 +589,14 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.63", ] [[package]] name = "der" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" dependencies = [ "const-oid", "zeroize", @@ -616,9 +604,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", ] @@ -722,15 +710,6 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" -[[package]] -name = "ed25519" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" -dependencies = [ - "signature 1.6.4", -] - [[package]] name = "ed25519" version = "2.2.3" @@ -738,31 +717,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ "pkcs8", - "signature 2.2.0", + "signature", ] [[package]] name = "ed25519-dalek" -version = "1.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" +checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ - "curve25519-dalek 3.2.0", - "ed25519 1.5.3", - "rand 0.7.3", - "serde", - "sha2 0.9.9", - "zeroize", -] - -[[package]] -name = "ed25519-dalek" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0" -dependencies = [ - "curve25519-dalek 4.1.1", - "ed25519 2.2.3", + "curve25519-dalek", + "ed25519", "rand_core 0.6.4", "serde", "sha2 0.10.8", @@ -772,15 +737,15 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if 1.0.0", ] @@ -793,9 +758,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -803,14 +768,109 @@ dependencies = [ [[package]] name = "ever-struct" -version = "1.0.14" -source = "git+https://github.com/tonlabs/ever-struct.git?tag=1.0.14#d98be0b8edb31ef6662ddc263c7164a45785c767" +version = "1.0.36" +source = "git+https://github.com/everx-labs/ever-struct.git?tag=1.0.36#661ca2fc9634d4d8b519062f37ded2852402c811" dependencies = [ "anyhow", + "ever_block", "failure", "hex-literal", - "ton_block", - "ton_types 2.0.31", +] + +[[package]] +name = "ever_abi" +version = "2.5.5" +source = "git+https://github.com/everx-labs/ever-abi.git?tag=2.5.5#eab8c8569843f8682e5a2fb40845e2c6347af8fb" +dependencies = [ + "base64 0.10.1", + "byteorder", + "chrono", + "ever_block", + "failure", + "hex 0.3.2", + "num-bigint", + "num-traits", + "serde", + "serde_derive", + "serde_json", + "sha2 0.10.8", +] + +[[package]] +name = "ever_block" +version = "1.10.4" +source = "git+https://github.com/everx-labs/ever-block.git?tag=1.10.4#15522b2caf9eccae8b06e099eafabe3fdf252b49" +dependencies = [ + "aes-ctr", + "base64 0.13.1", + "blst", + "crc 3.2.1", + "curve25519-dalek", + "ed25519", + "ed25519-dalek", + "failure", + "getrandom 0.2.15", + "hex 0.4.3", + "lazy_static", + "lockfree", + "log", + "num", + "num-derive", + "num-traits", + "rand 0.8.5", + "serde", + "serde_json", + "sha2 0.10.8", + "smallvec", + "x25519-dalek", +] + +[[package]] +name = "ever_block_json" +version = "0.8.9" +source = "git+https://github.com/everx-labs/ever-block-json.git?tag=0.8.9#a0fd6a6dfd5446d07bc47567522c4ef1372afd02" +dependencies = [ + "ever_block", + "failure", + "hex 0.4.3", + "lazy_static", + "log", + "metrics", + "num", + "num-traits", + "serde", + "serde_derive", + "serde_json", + "ton_api", +] + +[[package]] +name = "ever_executor" +version = "1.17.9" +source = "git+https://github.com/everx-labs/ever-executor.git?tag=1.17.9#1592d059a7a0a78316876e4c249adb1007a600b1" +dependencies = [ + "ever_block", + "ever_vm", + "failure", + "lazy_static", + "log", +] + +[[package]] +name = "ever_vm" +version = "2.1.7" +source = "git+https://github.com/everx-labs/ever-vm.git?tag=2.1.7#91c708d2fbb1b74515f119ebb2ea3ccd6f4883e6" +dependencies = [ + "diffy", + "ever_block", + "failure", + "hex 0.4.3", + "lazy_static", + "log", + "num", + "num-traits", + "similar", + "zstd", ] [[package]] @@ -843,15 +903,15 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fiat-crypto" -version = "0.2.5" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "float-cmp" @@ -894,9 +954,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -909,9 +969,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -919,15 +979,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -936,38 +996,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.63", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -1006,9 +1066,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -1041,9 +1101,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.22" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -1051,7 +1111,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 2.1.0", + "indexmap", "slab", "tokio", "tokio-util", @@ -1064,20 +1124,20 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash 0.7.7", + "ahash 0.7.8", ] [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -1139,9 +1199,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -1210,7 +1270,7 @@ dependencies = [ "futures-util", "http", "hyper", - "rustls 0.21.10", + "rustls 0.21.12", "tokio", "tokio-rustls 0.24.1", ] @@ -1230,9 +1290,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1251,17 +1311,6 @@ dependencies = [ "cc", ] -[[package]] -name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "idna" version = "0.3.0" @@ -1304,22 +1353,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.3" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - -[[package]] -name = "indexmap" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -1339,24 +1378,24 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.27" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -1380,19 +1419,18 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.151" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "libredox" -version = "0.0.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "libc", - "redox_syscall", ] [[package]] @@ -1443,23 +1481,17 @@ dependencies = [ "libsecp256k1-core", ] -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - [[package]] name = "linux-raw-sys" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -1468,16 +1500,16 @@ dependencies = [ [[package]] name = "lockfree" version = "0.5.1" -source = "git+https://github.com/tonlabs/lockfree.git#bfcb66587dc4ffed9e8e9248995ad2fe8dc3669e" +source = "git+https://github.com/everx-labs/lockfree.git#bfcb66587dc4ffed9e8e9248995ad2fe8dc3669e" dependencies = [ "owned-alloc", ] [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" dependencies = [ "serde", ] @@ -1490,9 +1522,9 @@ checksum = "a94d21414c1f4a51209ad204c1776a3d0765002c76c6abcb602a6f09f1e881c7" [[package]] name = "log4rs" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d36ca1786d9e79b8193a68d480a0907b612f109537115c6ff655a3a1967533fd" +checksum = "0816135ae15bd0391cf284eab37e6e3ee0a6ee63d2ceeb659862bd8d0a984ca6" dependencies = [ "anyhow", "arc-swap", @@ -1503,7 +1535,9 @@ dependencies = [ "libc", "log", "log-mdc", + "once_cell", "parking_lot", + "rand 0.8.5", "serde", "serde-value", "serde_json", @@ -1523,17 +1557,11 @@ dependencies = [ "hashbrown 0.12.3", ] -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "metrics" @@ -1541,20 +1569,20 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fde3af1a009ed76a778cb84fdef9e7dbbdf5775ae3e4cc1f434a6a307f6f76c5" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.11", "metrics-macros", "portable-atomic", ] [[package]] name = "metrics-macros" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddece26afd34c31585c74a4db0630c376df271c285d682d1e55012197830b6df" +checksum = "38b4faf00617defe497754acde3024865bc143d44a86799b24e191ecff91354f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.63", ] [[package]] @@ -1565,18 +1593,18 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi 0.11.0+wasi-snapshot-preview1", @@ -1609,9 +1637,9 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[package]] name = "num" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" dependencies = [ "num-bigint", "num-complex", @@ -1623,24 +1651,29 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" dependencies = [ - "autocfg", "num-integer", "num-traits", ] [[package]] name = "num-complex" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ "num-traits", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-derive" version = "0.3.3" @@ -1654,19 +1687,18 @@ dependencies = [ [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-iter" -version = "0.1.43" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -1675,11 +1707,10 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "autocfg", "num-bigint", "num-integer", "num-traits", @@ -1687,9 +1718,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -1706,9 +1737,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] @@ -1721,17 +1752,17 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "opaque-debug" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openssl" -version = "0.10.61" +version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b8419dc8cc6d866deb801274bba2e6f8f6108c1bb7fcc10ee5ab864931dbb45" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "cfg-if 1.0.0", "foreign-types", "libc", @@ -1748,7 +1779,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.63", ] [[package]] @@ -1759,18 +1790,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.2.1+3.2.0" +version = "300.2.3+3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fe476c29791a5ca0d1273c697e96085bbabbbea2ef7afd5617e78a4b40332d3" +checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.97" +version = "0.9.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3eaad34cdd97d81de97964fc7f29e2d104f483840d906ef56daa1912338460b" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", @@ -1796,9 +1827,9 @@ checksum = "30fceb411f9a12ff9222c5f824026be368ff15dc2f13468d850c7d3f502205d6" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" dependencies = [ "lock_api", "parking_lot_core", @@ -1806,15 +1837,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] @@ -1843,9 +1874,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.5" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" +checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" dependencies = [ "memchr", "thiserror", @@ -1854,9 +1885,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.5" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81d78524685f5ef2a3b3bd1cafbc9fcabb036253d9b1463e726a91cd16e2dfc2" +checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" dependencies = [ "pest", "pest_generator", @@ -1864,22 +1895,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.5" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68bd1206e71118b5356dae5ddc61c8b11e28b09ef6a31acbd15ea48a28e0c227" +checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.63", ] [[package]] name = "pest_meta" -version = "2.7.5" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c747191d4ad9e4a4ab9c8798f1e82a39affe7ef9648390b7e5548d18e099de6" +checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" dependencies = [ "once_cell", "pest", @@ -1888,9 +1919,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -1910,15 +1941,15 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "platforms" -version = "3.2.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14e6ab3f592e6fb464fc9712d8d6e6912de6473954635fd76a589d832cffcbb0" +checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" [[package]] name = "pom" @@ -1996,9 +2027,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" dependencies = [ "unicode-ident", ] @@ -2021,9 +2052,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -2087,7 +2118,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.15", ] [[package]] @@ -2101,33 +2132,33 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", ] [[package]] name = "redox_users" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.15", "libredox", "thiserror", ] [[package]] name = "regex" -version = "1.10.2" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", + "regex-automata 0.4.6", "regex-syntax", ] @@ -2139,9 +2170,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", @@ -2150,17 +2181,17 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "reqwest" -version = "0.11.23" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "bytes", "cookie", "cookie_store", @@ -2181,12 +2212,13 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.10", + "rustls 0.21.12", "rustls-native-certs", "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", "system-configuration", "tokio", "tokio-native-tls", @@ -2196,7 +2228,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots 0.25.3", + "webpki-roots 0.25.4", "winreg", ] @@ -2217,23 +2249,24 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", - "getrandom 0.2.11", + "cfg-if 1.0.0", + "getrandom 0.2.15", "libc", "spin 0.9.8", "untrusted 0.9.0", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -2252,11 +2285,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.28" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys", @@ -2277,12 +2310,12 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.10" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", - "ring 0.17.7", + "ring 0.17.8", "rustls-webpki", "sct", ] @@ -2305,7 +2338,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", ] [[package]] @@ -2314,15 +2347,15 @@ version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.7", + "ring 0.17.8", "untrusted 0.9.0", ] [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "salsa20" @@ -2335,11 +2368,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2366,7 +2399,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.7", + "ring 0.17.8", "untrusted 0.9.0", ] @@ -2381,11 +2414,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.2" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "core-foundation", "core-foundation-sys", "libc", @@ -2394,9 +2427,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ "core-foundation-sys", "libc", @@ -2404,15 +2437,15 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.20" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.193" +version = "1.0.202" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" dependencies = [ "serde_derive", ] @@ -2429,22 +2462,22 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.202" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.63", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ - "indexmap 2.1.0", + "indexmap", "itoa", "ryu", "serde", @@ -2452,13 +2485,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.17" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.63", ] [[package]] @@ -2475,14 +2508,15 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.8.26" +version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 1.9.3", + "indexmap", + "itoa", "ryu", "serde", - "yaml-rust", + "unsafe-libyaml", ] [[package]] @@ -2520,12 +2554,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "signature" -version = "1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" - [[package]] name = "signature" version = "2.2.0" @@ -2537,9 +2565,9 @@ dependencies = [ [[package]] name = "similar" -version = "2.3.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597" +checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" dependencies = [ "bstr", ] @@ -2555,24 +2583,24 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "sodalite" version = "0.3.0" -source = "git+https://github.com/tonlabs/sodalite.git#667f7f01290c95fdbeadc5bce3e32c1d14b92fe1" +source = "git+https://github.com/everx-labs/sodalite.git#667f7f01290c95fdbeadc5bce3e32c1d14b92fe1" dependencies = [ "index-fixed", "rand 0.7.3", @@ -2619,15 +2647,21 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.41" +version = "2.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269" +checksum = "bf5be731623ca1a1fb7d8be6f261a3be6d3e2337b8a1f97be944d020c8fcb704" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + [[package]] name = "synstructure" version = "0.12.6" @@ -2663,15 +2697,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.8.1" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if 1.0.0", "fastrand", - "redox_syscall", "rustix", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2682,22 +2715,22 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "thiserror" -version = "1.0.51" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f11c217e1416d6f036b870f14e0413d480dbf28edbee1f877abaf0206af43bb7" +checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.51" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df" +checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.63", ] [[package]] @@ -2721,12 +2754,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.30" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", + "num-conv", "powerfmt", "serde", "time-core", @@ -2741,10 +2775,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] @@ -2784,9 +2819,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -2807,7 +2842,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.63", ] [[package]] @@ -2837,15 +2872,15 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.10", + "rustls 0.21.12", "tokio", ] [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", @@ -2873,44 +2908,24 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", -] - -[[package]] -name = "ton_abi" -version = "2.4.10" -source = "git+https://github.com/tonlabs/ever-abi.git?tag=2.4.10#157d4ee3f5c2b433db01f0b82630dab9c51e5efe" -dependencies = [ - "base64 0.10.1", - "byteorder", - "chrono", - "failure", - "hex 0.3.2", - "num-bigint", - "num-traits", - "serde", - "serde_derive", - "serde_json", - "sha2 0.10.8", - "ton_block", - "ton_types 2.0.31", ] [[package]] name = "ton_api" -version = "0.3.54" -source = "git+https://github.com/tonlabs/ever-tl.git?tag=0.3.54#4ba28623dedcaa6f76ba98aceb649f115a8a97a0" +version = "0.3.82" +source = "git+https://github.com/everx-labs/ever-tl.git?tag=0.3.82#be94e9499887ec0e57f9a25c0c9e1e4e76aa9612" dependencies = [ "byteorder", + "ever_block", "extfmt", "failure", "hex 0.4.3", @@ -2920,53 +2935,12 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "ton_block", "ton_tl_codegen", - "ton_types 2.0.31", -] - -[[package]] -name = "ton_block" -version = "1.9.118" -source = "git+https://github.com/tonlabs/ever-block.git?tag=1.9.118#49a60ea5ddbdf1fc05f069940ef5d25a15822dcf" -dependencies = [ - "base64 0.13.1", - "crc 3.0.1", - "ed25519 1.5.3", - "ed25519-dalek 1.0.1", - "failure", - "hex 0.4.3", - "log", - "num", - "num-traits", - "sha2 0.10.8", - "ton_types 2.0.31", -] - -[[package]] -name = "ton_block_json" -version = "0.7.206" -source = "git+https://github.com/tonlabs/ever-block-json.git?tag=0.7.206#b043222df6dcb551463b4b3ce5dd1decd4cd6dcc" -dependencies = [ - "base64 0.13.1", - "failure", - "hex 0.4.3", - "lazy_static", - "log", - "metrics", - "num", - "num-traits", - "serde", - "serde_derive", - "serde_json", - "ton_api", - "ton_block", - "ton_types 2.0.31", ] [[package]] name = "ton_client" -version = "1.45.1" +version = "1.46.1" dependencies = [ "aes", "api_derive", @@ -2979,10 +2953,15 @@ dependencies = [ "byteorder", "chacha20", "chrono", - "crc 3.0.1", + "crc 3.2.1", "dirs 2.0.2", - "ed25519-dalek 2.1.0", + "ed25519-dalek", "ever-struct", + "ever_abi", + "ever_block", + "ever_block_json", + "ever_executor", + "ever_vm", "failure", "futures", "graphql-parser", @@ -3016,14 +2995,8 @@ dependencies = [ "tokio", "tokio-stream", "tokio-tungstenite", - "ton_abi", - "ton_block", - "ton_block_json", "ton_client_processing", - "ton_executor", "ton_sdk", - "ton_types 2.0.31", - "ton_vm", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -3033,12 +3006,13 @@ dependencies = [ [[package]] name = "ton_client_processing" -version = "1.45.1" +version = "1.46.1" dependencies = [ "api_derive", "api_info", "async-trait", - "base64 0.21.5", + "base64 0.21.7", + "ever_block", "futures", "log", "serde", @@ -3046,31 +3020,18 @@ dependencies = [ "serde_json", "serde_repr", "tokio", - "ton_block", - "ton_types 2.0.31", -] - -[[package]] -name = "ton_executor" -version = "1.16.98" -source = "git+https://github.com/tonlabs/ever-executor.git?tag=1.16.98#b059ff8b96916b978b9a55194a3d04decfcfc2d9" -dependencies = [ - "failure", - "lazy_static", - "log", - "ton_block", - "ton_types 2.0.31", - "ton_vm", ] [[package]] name = "ton_sdk" -version = "1.45.1" +version = "1.46.1" dependencies = [ "api_derive", "api_info", "base64 0.10.1", "chrono", + "ever_abi", + "ever_block", "failure", "hex 0.3.2", "lazy_static", @@ -3081,15 +3042,12 @@ dependencies = [ "serde_derive", "serde_json", "sha2 0.9.9", - "ton_abi", - "ton_block", - "ton_types 2.0.31", ] [[package]] name = "ton_tl_codegen" version = "0.1.0" -source = "git+https://github.com/tonlabs/ever-tl.git?tag=0.3.54#4ba28623dedcaa6f76ba98aceb649f115a8a97a0" +source = "git+https://github.com/everx-labs/ever-tl.git?tag=0.3.82#be94e9499887ec0e57f9a25c0c9e1e4e76aa9612" dependencies = [ "crc 1.8.1", "failure", @@ -3101,78 +3059,9 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "ton_types" -version = "1.11.4" -source = "git+https://github.com/tonlabs/ton-labs-types.git?tag=1.11.4#c2204fe7610017a1b98ab196e0afd4e979d033e2" -dependencies = [ - "base64 0.13.1", - "crc 1.8.1", - "failure", - "hex 0.4.3", - "lazy_static", - "lockfree", - "log", - "num", - "num-derive", - "num-traits", - "rand 0.8.5", - "sha2 0.9.9", - "smallvec", -] - -[[package]] -name = "ton_types" -version = "2.0.31" -source = "git+https://github.com/tonlabs/ever-types.git?tag=2.0.31#23a46666bed1d6c7fc5c0061992e5ee0762f7686" -dependencies = [ - "aes-ctr", - "base64 0.13.1", - "blst", - "crc 3.0.1", - "curve25519-dalek 4.1.1", - "ed25519 2.2.3", - "ed25519-dalek 2.1.0", - "failure", - "hex 0.4.3", - "lazy_static", - "lockfree", - "log", - "num", - "num-derive", - "num-traits", - "rand 0.8.5", - "serde", - "serde_json", - "sha2 0.10.8", - "smallvec", - "x25519-dalek", -] - -[[package]] -name = "ton_vm" -version = "1.8.226" -source = "git+https://github.com/tonlabs/ever-vm.git?tag=1.8.226#ef47923cfc34e0261cc75f27564223b91818f238" -dependencies = [ - "diffy", - "ed25519 1.5.3", - "ed25519-dalek 1.0.1", - "failure", - "hex 0.4.3", - "lazy_static", - "log", - "num", - "num-traits", - "rand 0.7.3", - "similar", - "ton_block", - "ton_types 2.0.31", - "zstd", -] - [[package]] name = "toncli" -version = "1.45.1" +version = "1.46.1" dependencies = [ "api_info", "assert_cmd", @@ -3263,9 +3152,9 @@ checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" [[package]] name = "unicode-bidi" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -3275,9 +3164,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] @@ -3306,6 +3195,12 @@ dependencies = [ "destructure_traitobject", ] +[[package]] +name = "unsafe-libyaml" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" + [[package]] name = "untrusted" version = "0.7.1" @@ -3323,13 +3218,13 @@ name = "update_trusted_blocks" version = "0.1.0" dependencies = [ "bincode", + "ever_block", "failure", "serde", "serde_derive", "serde_json", "tokio", "ton_client", - "ton_types 1.11.4", ] [[package]] @@ -3355,7 +3250,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.15", ] [[package]] @@ -3408,9 +3303,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -3418,24 +3313,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.63", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.39" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -3445,9 +3340,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3455,28 +3350,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.63", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" -version = "0.3.66" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -3488,7 +3383,7 @@ version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "ring 0.17.7", + "ring 0.17.8", "untrusted 0.9.0", ] @@ -3503,9 +3398,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.3" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "winapi" @@ -3531,11 +3426,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-core" -version = "0.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] @@ -3553,7 +3448,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.5", ] [[package]] @@ -3573,17 +3468,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -3594,9 +3490,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -3606,9 +3502,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -3618,9 +3514,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -3630,9 +3532,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -3642,9 +3544,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -3654,9 +3556,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -3666,9 +3568,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winreg" @@ -3682,25 +3584,16 @@ dependencies = [ [[package]] name = "x25519-dalek" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" +checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ - "curve25519-dalek 4.1.1", + "curve25519-dalek", "rand_core 0.6.4", "serde", "zeroize", ] -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] - [[package]] name = "yansi" version = "0.5.1" @@ -3709,22 +3602,22 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "zerocopy" -version = "0.7.31" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.31" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.63", ] [[package]] @@ -3744,7 +3637,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.63", ] [[package]] @@ -3768,9 +3661,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.9+zstd.1.5.5" +version = "2.0.10+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" +checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" dependencies = [ "cc", "pkg-config", diff --git a/README.md b/README.md index a553a78b4..254e32ffa 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Core Ever-SDK client library is written in Rust, with bindings in 11 programming ### Rust (core library) -Repository: https://github.com/tonlabs/ever-sdk +Repository: https://github.com/everx-labs/ever-sdk **What is Core Client Library?** @@ -42,17 +42,17 @@ Client Library exposes all the functionality through a few of exported functions ### Official Javascript(Typescript) binding -Repository: [JavaScript SDK](https://github.com/tonlabs/ever-sdk-js) +Repository: [JavaScript SDK](https://github.com/everx-labs/ever-sdk-js) -You need to install core package and the package with binary for your platform. [See the documentation.](https://github.com/tonlabs/ever-sdk-js#library-distribution) +You need to install core package and the package with binary for your platform. [See the documentation.](https://github.com/everx-labs/ever-sdk-js#library-distribution) | Platform | Package | | ------------------------------ | ----------------------------------------------------------------------------------------------------------------- | -| core package for all platforms | [@eversdk/core](https://github.com/tonlabs/ever-sdk-js#install-core-package) | -| Node.js | [@eversdk/lib-node](https://github.com/tonlabs/ever-sdk-js#nodejs) | -| Web | [@eversdk/lib-web](https://github.com/tonlabs/ever-sdk-js#web) | -| React-Native | [@eversdk/lib-react-native](https://github.com/tonlabs/ever-sdk-js#react-native) | -| React-Native with JSI support | [@eversdk/lib-react-native-jsi](https://github.com/tonlabs/ever-sdk-js/tree/master/packages/lib-react-native-jsi) | +| core package for all platforms | [@eversdk/core](https://github.com/everx-labs/ever-sdk-js#install-core-package) | +| Node.js | [@eversdk/lib-node](https://github.com/everx-labs/ever-sdk-js#nodejs) | +| Web | [@eversdk/lib-web](https://github.com/everx-labs/ever-sdk-js#web) | +| React-Native | [@eversdk/lib-react-native](https://github.com/everx-labs/ever-sdk-js#react-native) | +| React-Native with JSI support | [@eversdk/lib-react-native-jsi](https://github.com/everx-labs/ever-sdk-js/tree/master/packages/lib-react-native-jsi) | ### Community bindings @@ -105,7 +105,7 @@ See the list of available TVM networks: [https://docs.everplatform.dev/products/ [Error descriptions](docs/reference/error\_codes.md) -[JavaScript SDK Types and Methods (API Reference)](https://tonlabs.github.io/ever-sdk-js/) +[JavaScript SDK Types and Methods (API Reference)](https://everx-labs.github.io/ever-sdk-js/) [Core Types and Methods (API Reference)](docs/reference/types-and-methods/modules.md) @@ -210,7 +210,7 @@ To run test suite use standard Rust test command cargo test ``` -SDK tests need [EVER OS API](https://docs.everplatform.dev/reference/graphql-api/networks) endpoint to run on. Such an API is exposed by a [DApp Server](https://github.com/tonlabs/evernode-ds) which runs in real networks and by local blockchain [Evernode SE](https://github.com/tonlabs/evernode-se). +SDK tests need [EVER OS API](https://docs.everplatform.dev/reference/graphql-api/networks) endpoint to run on. Such an API is exposed by a [DApp Server](https://github.com/everx-labs/evernode-ds) which runs in real networks and by local blockchain [Evernode SE](https://github.com/everx-labs/evernode-se). Evernode SE is used by default with address `http://localhost` and port 80. If you launch it on another port you need to specify it explicitly like this: `http://localhost:port`. If you have Evernode SE running on another address or you need to run tests on a real Everscale network use the following environment variables to override the default parameters @@ -228,14 +228,14 @@ Instead of building library yourself, you can download the **latest** precompile | Platform | Major | Download links | | -------- | ----- | -------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Win32 | 0 | [`ton_client.lib`](https://binaries.tonlabs.io/tonclient\_0\_win32\_lib.gz), [`ton_client.dll`](https://binaries.tonlabs.io/tonclient\_0\_win32\_dll.gz) | -| | 1 | [`ton_client.lib`](https://binaries.tonlabs.io/tonclient\_1\_win32\_lib.gz), [`ton_client.dll`](https://binaries.tonlabs.io/tonclient\_1\_win32\_dll.gz) | -| macOS | 0 | [`libton_client.dylib`](https://binaries.tonlabs.io/tonclient\_0\_darwin.gz) | -| | 1 | (x86\_64)[`libton_client.dylib`](https://binaries.tonlabs.io/tonclient\_1\_darwin.gz) | -| | 1 | (aarch64)[`libton_client.dylib`](https://binaries.tonlabs.io/tonclient\_1\_darwin\_arm64.gz) | -| Linux | 0 | [`libton_client.so`](https://binaries.tonlabs.io/tonclient\_0\_linux.gz) | -| | 1 | [`libton_client.so`](https://binaries.tonlabs.io/tonclient\_1\_linux.gz) | - -If you want an older version of library (e.g. `0.25.0` for macOS), you need to choose a link to your platform from the list above and replace `0` with a version: [https://binaries.tonlabs.io/tonclient\_**0\_25\_0**\_darwin.gz](https://binaries.tonlabs.io/tonclient\_0\_25\_0\_darwin.gz) +| Win32 | 0 | [`ton_client.lib`](https://binaries.everx-labs.io/tonclient\_0\_win32\_lib.gz), [`ton_client.dll`](https://binaries.everx-labs.io/tonclient\_0\_win32\_dll.gz) | +| | 1 | [`ton_client.lib`](https://binaries.everx-labs.io/tonclient\_1\_win32\_lib.gz), [`ton_client.dll`](https://binaries.everx-labs.io/tonclient\_1\_win32\_dll.gz) | +| macOS | 0 | [`libton_client.dylib`](https://binaries.everx-labs.io/tonclient\_0\_darwin.gz) | +| | 1 | (x86\_64)[`libton_client.dylib`](https://binaries.everx-labs.io/tonclient\_1\_darwin.gz) | +| | 1 | (aarch64)[`libton_client.dylib`](https://binaries.everx-labs.io/tonclient\_1\_darwin\_arm64.gz) | +| Linux | 0 | [`libton_client.so`](https://binaries.everx-labs.io/tonclient\_0\_linux.gz) | +| | 1 | [`libton_client.so`](https://binaries.everx-labs.io/tonclient\_1\_linux.gz) | + +If you want an older version of library (e.g. `0.25.0` for macOS), you need to choose a link to your platform from the list above and replace `0` with a version: [https://binaries.everx-labs.io/tonclient\_**0\_25\_0**\_darwin.gz](https://binaries.everx-labs.io/tonclient\_0\_25\_0\_darwin.gz) _Downloaded archive is gzipped file_ diff --git a/api/derive/Cargo.toml b/api/derive/Cargo.toml index 6f60b3963..c78725af5 100644 --- a/api/derive/Cargo.toml +++ b/api/derive/Cargo.toml @@ -1,8 +1,8 @@ [package] -authors = [ 'TON Labs LTD ' ] +authors = [ 'TON Labs LTD ' ] edition = '2018' name = 'api_derive' -version = '1.45.1' +version = '1.46.1' [dependencies] quote = '1.0.26' diff --git a/api/info/Cargo.toml b/api/info/Cargo.toml index 540983ab4..cf2463116 100644 --- a/api/info/Cargo.toml +++ b/api/info/Cargo.toml @@ -1,8 +1,8 @@ [package] -authors = [ 'TON Labs LTD ' ] +authors = [ 'TON Labs LTD ' ] edition = '2018' name = 'api_info' -version = '1.45.1' +version = '1.46.1' [dependencies] serde = '1.0.115' diff --git a/api/test/Cargo.toml b/api/test/Cargo.toml index 783047741..5318594bf 100644 --- a/api/test/Cargo.toml +++ b/api/test/Cargo.toml @@ -1,8 +1,8 @@ [package] -authors = [ 'TON Labs LTD ' ] +authors = [ 'TON Labs LTD ' ] edition = '2018' name = 'api_test' -version = '1.45.1' +version = '1.46.1' [dependencies] serde = '1.0.115' diff --git a/docs/SUMMARY.md b/docs/SUMMARY.md index ca4b9a5f8..f4331c25d 100644 --- a/docs/SUMMARY.md +++ b/docs/SUMMARY.md @@ -20,12 +20,12 @@ * [Module utils](reference/types-and-methods/mod\_utils.md) * [Error API](reference/error\_api.md) * [Error Codes](reference/error\_codes.md) -* [JavaScript Reference](https://tonlabs.github.io/ever-sdk-js/) -* [Rust Reference](https://github.com/tonlabs/ever-sdk/tree/master/docs/reference/rust-api) +* [JavaScript Reference](https://everx-labs.github.io/ever-sdk-js/) +* [Rust Reference](https://github.com/everx-labs/ever-sdk/tree/master/docs/reference/rust-api) ## Samples -* [JavaScript Samples](https://github.com/tonlabs/sdk-samples) +* [JavaScript Samples](https://github.com/everx-labs/sdk-samples) ## guides @@ -69,5 +69,5 @@ ## Links -* [Ever SDK repository](https://github.com/tonlabs/ever-sdk) +* [Ever SDK repository](https://github.com/everx-labs/ever-sdk) * [AppKit JS documentation](https://docs.everos.dev/appkit-js/) diff --git a/docs/add_to_backend.md b/docs/add_to_backend.md index d0a37e7b0..dedcf0bd1 100644 --- a/docs/add_to_backend.md +++ b/docs/add_to_backend.md @@ -33,7 +33,7 @@ Note: We recommend testing out the full setup on the developer network first. If you prefer to run your own node, you may set up your own [DApp server](https://docs.everplatform.dev/products/dapp-server-ds). It is a client supernode, that may be set up on your own servers and provide full access to TVM networks. To connect to it with Everdev or SDK, it needs to have a domain name and a DNS record. You can specify its URL whenever you have to set the network in the examples given below. -Get the setup scripts in this repository: [https://github.com/tonlabs/evernode-ds](https://github.com/tonlabs/evernode-ds) +Get the setup scripts in this repository: [https://github.com/everx-labs/evernode-ds](https://github.com/everx-labs/evernode-ds) #### 1. System Requirements @@ -92,7 +92,7 @@ Use the following command to check the progress: Script output example: ``` -tonlabs console 0.1.286 +everx-labs console 0.1.286 COMMIT_ID: 5efe6bb8f2a974ba0e6b1ea3e58233632236e182 BUILD_DATE: 2022-10-17 02:32:44 +0300 COMMIT_DATE: 2022-08-12 00:22:07 +0300 @@ -296,15 +296,15 @@ Contract is deployed at address: 0:95c35b94e98c1b5c7716a9129ed5bb0798c8c336465fd You may integrate above described process of wallet account deployment into your backend code. The functionality is supported in SDK. -A sample is available in [this repository](https://github.com/tonlabs/sdk-samples/tree/master/demo/msig-wallet) and an overview is given below. +A sample is available in [this repository](https://github.com/everx-labs/sdk-samples/tree/master/demo/msig-wallet) and an overview is given below. {% hint style="info" %} [Bindings](https://docs.everos.dev/ever-sdk/#community-bindings) for a large number of languages have been developed for SDK. {% endhint %} -Note, that similar to the Everdev approach described above, you have to sponsor a user account before deploying contract code. The sample assumes you use the devnet faucet of [Evercloud Dashboard](https://dashboard.evercloud.dev/), where you can request test tokens to the contract address generated by the sample. In a production environment you may set up a giver to sponsor your contract deployment operations. An example of such a set up can be found in this [sample](https://github.com/tonlabs/sdk-samples/tree/master/demo/hello-wallet). +Note, that similar to the Everdev approach described above, you have to sponsor a user account before deploying contract code. The sample assumes you use the devnet faucet of [Evercloud Dashboard](https://dashboard.evercloud.dev/), where you can request test tokens to the contract address generated by the sample. In a production environment you may set up a giver to sponsor your contract deployment operations. An example of such a set up can be found in this [sample](https://github.com/everx-labs/sdk-samples/tree/master/demo/hello-wallet). -The recommended [SetcodeMultisig](https://github.com/tonlabs/sdk-samples/blob/master/demo/msig-wallet/contract/SetcodeMultisig.sol) contract is used. +The recommended [SetcodeMultisig](https://github.com/everx-labs/sdk-samples/blob/master/demo/msig-wallet/contract/SetcodeMultisig.sol) contract is used. ```typescript @@ -407,13 +407,13 @@ The recommended [SetcodeMultisig](https://github.com/tonlabs/sdk-samples/blob/ma ## Monitoring transactions -Lets assume we need to reliably know when customers receive or transfer funds from their wallets. Samples of transaction [pagination](https://github.com/tonlabs/sdk-samples/tree/master/demo/paginate-transactions) and [subscription](https://github.com/tonlabs/sdk-samples/tree/master/demo/subscribe-transactions) are available in the samples repository. An overview of the relevant parts is given below. +Lets assume we need to reliably know when customers receive or transfer funds from their wallets. Samples of transaction [pagination](https://github.com/everx-labs/sdk-samples/tree/master/demo/paginate-transactions) and [subscription](https://github.com/everx-labs/sdk-samples/tree/master/demo/subscribe-transactions) are available in the samples repository. An overview of the relevant parts is given below. In these samples JS SDK is used. [Bindings](https://docs.everos.dev/ever-sdk/#community-bindings) for a large number of languages have been developed for SDK. ### Pagination -The [pagination](https://github.com/tonlabs/sdk-samples/tree/master/demo/paginate-transactions) sample queries and displays transactions in workchain 0 (workchain where simple transfers happen, -1 workchain is masterchain where you can find service transactions and validator transactions) from the beginning. We can get all the transaction and filter by account addresses on the backend side. +The [pagination](https://github.com/everx-labs/sdk-samples/tree/master/demo/paginate-transactions) sample queries and displays transactions in workchain 0 (workchain where simple transfers happen, -1 workchain is masterchain where you can find service transactions and validator transactions) from the beginning. We can get all the transaction and filter by account addresses on the backend side. **Note**: By default the Blockchain API queries, such as the one used here provide only data from the past 7 days. To retrieve older data, make sure to use the `archive: true` flag, as shown in the sample: @@ -493,7 +493,7 @@ function sleep(ms: number) { return new Promise(r => setTimeout(r, ms)) } ### Subscription -[Subscription](https://github.com/tonlabs/sdk-samples/tree/master/demo/subscribe-transactions) sample subscribes to new transactions of the listed accounts and lists them as they appear. +[Subscription](https://github.com/everx-labs/sdk-samples/tree/master/demo/subscribe-transactions) sample subscribes to new transactions of the listed accounts and lists them as they appear. ```typescript async function main() { @@ -555,7 +555,7 @@ function responseHandler(params: any, responseType: number) { } ``` -You may test out the demo application running this process on the developer network by cloning the [sdk-samples](https://github.com/tonlabs/sdk-samples) repository, creating a project in [https://dashboard.evercloud.dev](https://dashboard.evercloud.dev), exporting the API endpoint as an environment variable: +You may test out the demo application running this process on the developer network by cloning the [sdk-samples](https://github.com/everx-labs/sdk-samples) repository, creating a project in [https://dashboard.evercloud.dev](https://dashboard.evercloud.dev), exporting the API endpoint as an environment variable: ``` export ENDPOINT=https://devnet.evercloud.dev//graphql @@ -819,7 +819,7 @@ If the account is already active, a small portion of the requested amount may be ### Using SDK -You may integrate withdrawals from wallet account into your backend using SDK as well. A sample is available in [this repository](https://github.com/tonlabs/sdk-samples/tree/master/demo/msig-wallet) and an overview of the relevant part is given below. +You may integrate withdrawals from wallet account into your backend using SDK as well. A sample is available in [this repository](https://github.com/everx-labs/sdk-samples/tree/master/demo/msig-wallet) and an overview of the relevant part is given below. In this sample JS SDK is used. [Bindings](https://docs.everos.dev/ever-sdk/#community-bindings) for a large number of languages have been developed for SDK. diff --git a/docs/guides/configuration/endpoint-configuration.md b/docs/guides/configuration/endpoint-configuration.md index d356f11d0..e213e44a2 100644 --- a/docs/guides/configuration/endpoint-configuration.md +++ b/docs/guides/configuration/endpoint-configuration.md @@ -22,7 +22,7 @@ network: { ### Local node -If you want to work with [local blockchain Evernode-SE](https://github.com/tonlabs/evernode-se), specify [http://localhost](http://localhost) in the `endpoints` +If you want to work with [local blockchain Evernode-SE](https://github.com/everx-labs/evernode-se), specify [http://localhost](http://localhost) in the `endpoints` ```javascript const client = new TonClient({ diff --git a/docs/guides/installation/add_sdk_to_your_app.md b/docs/guides/installation/add_sdk_to_your_app.md index ba007796b..887012313 100644 --- a/docs/guides/installation/add_sdk_to_your_app.md +++ b/docs/guides/installation/add_sdk_to_your_app.md @@ -21,7 +21,7 @@ npm i --save @eversdk/core npm i --save @eversdk/lib-node ``` -If you want to use high-level [AppKit](https://github.com/tonlabs/ever-appkit-js) package then install this package as well: +If you want to use high-level [AppKit](https://github.com/everx-labs/ever-appkit-js) package then install this package as well: ``` npm i --save @eversdk/appkit @@ -64,7 +64,7 @@ npm i --save @eversdk/lib-web **Important!** Each time you run `npm install` the new version of the `eversdk.wasm` and `index.js` is downloaded. So you have to always update the `eversdk.wasm` inside your web package before publishing (starting local web server, creating web bundle etc.). If you use Webpack the best way is to use CopyPlugin. -If you want to use high-level [AppKit](https://github.com/tonlabs/ever-appkit-js) package then install this package as well: +If you want to use high-level [AppKit](https://github.com/everx-labs/ever-appkit-js) package then install this package as well: ``` npm i --save @eversdk/appkit diff --git a/docs/guides/queries_and_subscriptions/aggregate_collection.md b/docs/guides/queries_and_subscriptions/aggregate_collection.md index 750f5da1a..ff1178d6c 100644 --- a/docs/guides/queries_and_subscriptions/aggregate_collection.md +++ b/docs/guides/queries_and_subscriptions/aggregate_collection.md @@ -58,4 +58,4 @@ There are a few collections with blockchain data: [Reference](../../reference/types-and-methods/mod\_net.md#aggregate\_collection) -Sample: [https://github.com/tonlabs/sdk-samples/tree/master/core-examples/node-js/query](https://github.com/tonlabs/sdk-samples/tree/master/core-examples/node-js/query) +Sample: [https://github.com/everx-labs/sdk-samples/tree/master/core-examples/node-js/query](https://github.com/everx-labs/sdk-samples/tree/master/core-examples/node-js/query) diff --git a/docs/guides/queries_and_subscriptions/data-pagination.md b/docs/guides/queries_and_subscriptions/data-pagination.md index 3ea833588..ce7ed1404 100644 --- a/docs/guides/queries_and_subscriptions/data-pagination.md +++ b/docs/guides/queries_and_subscriptions/data-pagination.md @@ -15,4 +15,4 @@ Read about each entity type pagination API: Look at the sample how to implement these entities pagination with JS SDK: -{% embed url="https://github.com/tonlabs/sdk-samples/tree/master/core-examples/node-js/pagination" %} +{% embed url="https://github.com/everx-labs/sdk-samples/tree/master/core-examples/node-js/pagination" %} diff --git a/docs/guides/queries_and_subscriptions/query_collection.md b/docs/guides/queries_and_subscriptions/query_collection.md index e9c592bae..30493073d 100644 --- a/docs/guides/queries_and_subscriptions/query_collection.md +++ b/docs/guides/queries_and_subscriptions/query_collection.md @@ -40,8 +40,8 @@ await client.net.query_collection({ **Core** -[https://github.com/tonlabs/sdk-samples/tree/master/core-examples/node-js/query](https://github.com/tonlabs/sdk-samples/tree/master/core-examples/node-js/query) +[https://github.com/everx-labs/sdk-samples/tree/master/core-examples/node-js/query](https://github.com/everx-labs/sdk-samples/tree/master/core-examples/node-js/query) **AppKit** -[https://github.com/tonlabs/sdk-samples/tree/master/appkit-examples/query](https://github.com/tonlabs/sdk-samples/tree/master/appkit-examples/query) +[https://github.com/everx-labs/sdk-samples/tree/master/appkit-examples/query](https://github.com/everx-labs/sdk-samples/tree/master/appkit-examples/query) diff --git a/docs/guides/queries_and_subscriptions/raw_query.md b/docs/guides/queries_and_subscriptions/raw_query.md index d52cc21e3..b3caa81a3 100644 --- a/docs/guides/queries_and_subscriptions/raw_query.md +++ b/docs/guides/queries_and_subscriptions/raw_query.md @@ -54,4 +54,4 @@ await client.net.query({ See this sample to understand how to pass variables to the queries -{% embed url="https://github.com/tonlabs/sdk-samples/tree/master/core-examples/node-js/pagination" %} +{% embed url="https://github.com/everx-labs/sdk-samples/tree/master/core-examples/node-js/pagination" %} diff --git a/docs/guides/queries_and_subscriptions/subscribe_to_updates.md b/docs/guides/queries_and_subscriptions/subscribe_to_updates.md index ae65466f8..ed62c0e1c 100644 --- a/docs/guides/queries_and_subscriptions/subscribe_to_updates.md +++ b/docs/guides/queries_and_subscriptions/subscribe_to_updates.md @@ -63,4 +63,4 @@ const messageSubscription = await TonClient.default.net.subscribe_collection({ See this sample to understand how to use [subscribe\_collection](../../reference/types-and-methods/mod\_net.md#subscribe\_collection) function: -[https://github.com/tonlabs/sdk-samples/tree/master/core-examples/node-js/listen-and-decode](https://github.com/tonlabs/sdk-samples/tree/master/core-examples/node-js/listen-and-decode) +[https://github.com/everx-labs/sdk-samples/tree/master/core-examples/node-js/listen-and-decode](https://github.com/everx-labs/sdk-samples/tree/master/core-examples/node-js/listen-and-decode) diff --git a/docs/guides/work_with_contracts/add_contract_to_your_app.md b/docs/guides/work_with_contracts/add_contract_to_your_app.md index 02ab3b639..1de5fbc0e 100644 --- a/docs/guides/work_with_contracts/add_contract_to_your_app.md +++ b/docs/guides/work_with_contracts/add_contract_to_your_app.md @@ -16,8 +16,8 @@ If you need to deploy a contract, then you will also need its tvc file. This fil If you plan to develop and compile the contracts yourself then these docs will help you: * [Compiling contract with one command with everdev](https://docs.everos.dev/everdev/command-line-interface/solidity#compile) -* [Solidity Compiler](https://github.com/tonlabs/TON-Solidity-Compiler) -* [Public repository with contracts](https://github.com/tonlabs/ton-labs-contracts) +* [Solidity Compiler](https://github.com/everx-labs/TON-Solidity-Compiler) +* [Public repository with contracts](https://github.com/everx-labs/ton-labs-contracts) ## Create contract wrapper diff --git a/docs/guides/work_with_contracts/custom_giver.md b/docs/guides/work_with_contracts/custom_giver.md index 82e89c94f..dc647a519 100644 --- a/docs/guides/work_with_contracts/custom_giver.md +++ b/docs/guides/work_with_contracts/custom_giver.md @@ -106,7 +106,7 @@ Now you can use your new function for funding your contracts before deployment: ```javascript async function main(client) { // Define contract ABI in the Application - // See more info about ABI type here https://github.com/tonlabs/ever-sdk/blob/master/docs/mod_abi.md#abi + // See more info about ABI type here https://github.com/everx-labs/ever-sdk/blob/master/docs/mod_abi.md#abi const abi = { type: 'Contract', value: HelloWallet.abi @@ -115,7 +115,7 @@ async function main(client) { const helloKeys = await client.crypto.generate_random_sign_keys(); // Prepare parameters for deploy message encoding - // See more info about `encode_message` method parameters here https://github.com/tonlabs/ever-sdk/blob/master/docs/mod_abi.md#encode_message + // See more info about `encode_message` method parameters here https://github.com/everx-labs/ever-sdk/blob/master/docs/mod_abi.md#encode_message const deployOptions = { abi, deploy_set: { @@ -144,7 +144,7 @@ async function main(client) { // Deploy `hello` contract // See more info about `process_message` here - // https://github.com/tonlabs/ever-sdk/blob/master/docs/mod_processing.md#process_message + // https://github.com/everx-labs/ever-sdk/blob/master/docs/mod_processing.md#process_message await client.processing.process_message({ send_events: false, message_encode_params: deployOptions @@ -156,4 +156,4 @@ async function main(client) { ## Sample Source Code -Full sample: [https://github.com/tonlabs/sdk-samples/blob/master/core-examples/node-js/custom-giver/](https://github.com/tonlabs/sdk-samples/blob/master/core-examples/node-js/custom-giver/) +Full sample: [https://github.com/everx-labs/sdk-samples/blob/master/core-examples/node-js/custom-giver/](https://github.com/everx-labs/sdk-samples/blob/master/core-examples/node-js/custom-giver/) diff --git a/docs/guides/work_with_contracts/decode_message.md b/docs/guides/work_with_contracts/decode_message.md index 36d072d93..87c3bd567 100644 --- a/docs/guides/work_with_contracts/decode_message.md +++ b/docs/guides/work_with_contracts/decode_message.md @@ -45,8 +45,8 @@ case MessageBodyType.Event: **Core** -[https://github.com/tonlabs/sdk-samples/blob/master/core-examples/node-js/subscribe-and-decode/index.js](https://github.com/tonlabs/sdk-samples/blob/master/core-examples/node-js/subscribe-and-decode/index.js) +[https://github.com/everx-labs/sdk-samples/blob/master/core-examples/node-js/subscribe-and-decode/index.js](https://github.com/everx-labs/sdk-samples/blob/master/core-examples/node-js/subscribe-and-decode/index.js) **AppKit** -[https://github.com/tonlabs/sdk-samples/tree/master/appkit-examples/listen-and-decode](https://github.com/tonlabs/sdk-samples/tree/master/appkit-examples/listen-and-decode) +[https://github.com/everx-labs/sdk-samples/tree/master/appkit-examples/listen-and-decode](https://github.com/everx-labs/sdk-samples/tree/master/appkit-examples/listen-and-decode) diff --git a/docs/guides/work_with_contracts/deploy.md b/docs/guides/work_with_contracts/deploy.md index ddcc4e636..f73637057 100644 --- a/docs/guides/work_with_contracts/deploy.md +++ b/docs/guides/work_with_contracts/deploy.md @@ -18,7 +18,7 @@ Find out how to deploy a contract to Everscale Blockchain with SDK > [See the API reference](../../reference/types-and-methods/modules.md). -Core api is more flexible than [AppKit](https://github.com/tonlabs/ever-appkit-js), and you can perform a lot of complex logic using it. But you will need to write more code with it as well:) +Core api is more flexible than [AppKit](https://github.com/everx-labs/ever-appkit-js), and you can perform a lot of complex logic using it. But you will need to write more code with it as well:) You need to define the contract in your node.js application before deploy. @@ -131,7 +131,7 @@ const abi = { const helloKeys = await client.crypto.generate_random_sign_keys(); // Prepare parameters for deploy message encoding -// See more info about `encode_message` method parameters here https://github.com/tonlabs/ever-sdk/blob/master/docs/mod_abi.md#encode_message +// See more info about `encode_message` method parameters here https://github.com/everx-labs/ever-sdk/blob/master/docs/mod_abi.md#encode_message const deployOptions = { abi, deploy_set: { @@ -190,7 +190,7 @@ Method \`process\_message performs all the deploy steps sequentially in one meth ```javascript // Deploy `hello` contract // See more info about `process_message` here -// https://github.com/tonlabs/ever-sdk/blob/master/docs/mod_processing.md#process_message +// https://github.com/everx-labs/ever-sdk/blob/master/docs/mod_processing.md#process_message await client.processing.process_message({ send_events: false, message_encode_params: deployOptions @@ -201,7 +201,7 @@ console.log(`Hello contract was deployed at address: ${address}`); See the full example in sdk samples repository: -[https://github.com/tonlabs/sdk-samples/blob/master/core-examples/node-js/hello-wallet/index.js](https://github.com/tonlabs/sdk-samples/blob/master/core-examples/node-js/hello-wallet/index.js) +[https://github.com/everx-labs/sdk-samples/blob/master/core-examples/node-js/hello-wallet/index.js](https://github.com/everx-labs/sdk-samples/blob/master/core-examples/node-js/hello-wallet/index.js) Check out how to run contract's methods in the next [section](run\_onchain.md). @@ -213,7 +213,7 @@ To deploy a contract, first you need to create a deploy message that will includ ```javascript // Prepare parameters for deploy message encoding -// See more info about `encode_message` method parameters here https://github.com/tonlabs/ever-sdk/blob/master/docs/mod_abi.md#encode_message +// See more info about `encode_message` method parameters here https://github.com/everx-labs/ever-sdk/blob/master/docs/mod_abi.md#encode_message const deployOptions = { abi: { type: 'Contract', @@ -246,7 +246,7 @@ Now the message should be sent. `send_message` method returns the the last block ```javascript // Send deploy message to the network // See more info about `send_message` here -// https://github.com/tonlabs/ever-sdk/blob/master/docs/mod_processing.md#send_message +// https://github.com/everx-labs/ever-sdk/blob/master/docs/mod_processing.md#send_message var shard_block_id; shard_block_id = (await client.processing.send_message({ message: encode_deploy_result.message, @@ -261,7 +261,7 @@ After the message was sent we need to wait for the transaction: ```javascript // Monitor message delivery. // See more info about `wait_for_transaction` here -// https://github.com/tonlabs/ever-sdk/blob/master/docs/mod_processing.md#wait_for_transaction +// https://github.com/everx-labs/ever-sdk/blob/master/docs/mod_processing.md#wait_for_transaction const deploy_processing_result = await client.processing.wait_for_transaction({ abi: { type: 'Contract', @@ -281,7 +281,7 @@ If `wait_for_transaction` fails with 507 error - you can perform a retry. In all See the full example in sdk samples repository: -[https://github.com/tonlabs/sdk-samples/blob/master/core-examples/node-js/hello-wallet/index\_pattern2.js](https://github.com/tonlabs/sdk-samples/blob/master/core-examples/node-js/hello-wallet/index\_pattern2.js) +[https://github.com/everx-labs/sdk-samples/blob/master/core-examples/node-js/hello-wallet/index\_pattern2.js](https://github.com/everx-labs/sdk-samples/blob/master/core-examples/node-js/hello-wallet/index\_pattern2.js) Check out how to run contract's methods in the next [section](run\_onchain.md). @@ -300,6 +300,6 @@ You can get it several ways: ## Sample Source Code -Full sample: [https://github.com/tonlabs/sdk-samples/blob/master/core-examples/node-js/hello-wallet/](https://github.com/tonlabs/sdk-samples/blob/master/core-examples/node-js/hello-wallet/) +Full sample: [https://github.com/everx-labs/sdk-samples/blob/master/core-examples/node-js/hello-wallet/](https://github.com/everx-labs/sdk-samples/blob/master/core-examples/node-js/hello-wallet/) Check out [AppKit documentation](https://docs.everos.dev/appkit-js/guides/deploy) for this use case. diff --git a/docs/guides/work_with_contracts/emulate_transaction.md b/docs/guides/work_with_contracts/emulate_transaction.md index 99d1bf0f7..1dc784b3c 100644 --- a/docs/guides/work_with_contracts/emulate_transaction.md +++ b/docs/guides/work_with_contracts/emulate_transaction.md @@ -10,7 +10,7 @@ If you want to test your contract locally and find out will your operation work Core SDK provides [run_executor](../../reference/types-and-methods/mod\_tvm.md#run_executor) method of `tvm` module for it. -[AppKit](https://github.com/tonlabs/ever-appkit-js) provides `localDeploy` and `localRun` functions for it. +[AppKit](https://github.com/everx-labs/ever-appkit-js) provides `localDeploy` and `localRun` functions for it. ### How to emulate contract deploy? @@ -34,8 +34,8 @@ See the JavaScript samples below to understand how to emulate contract deploy. **Core** -[https://github.com/tonlabs/sdk-samples/tree/master/core-examples/node-js/run_executor](https://github.com/tonlabs/sdk-samples/tree/master/core-examples/node-js/run_executor) +[https://github.com/everx-labs/sdk-samples/tree/master/core-examples/node-js/run_executor](https://github.com/everx-labs/sdk-samples/tree/master/core-examples/node-js/run_executor) **AppKit** -[https://github.com/tonlabs/sdk-samples/tree/master/appkit-examples/run_executor](https://github.com/tonlabs/sdk-samples/tree/master/appkit-examples/run_executor) +[https://github.com/everx-labs/sdk-samples/tree/master/appkit-examples/run_executor](https://github.com/everx-labs/sdk-samples/tree/master/appkit-examples/run_executor) diff --git a/docs/guides/work_with_contracts/estimate_fees.md b/docs/guides/work_with_contracts/estimate_fees.md index bc480a35a..eda8c9ec8 100644 --- a/docs/guides/work_with_contracts/estimate_fees.md +++ b/docs/guides/work_with_contracts/estimate_fees.md @@ -59,8 +59,8 @@ Use [calc\_storage\_fee](../../reference/types-and-methods/mod\_utils.md#calc\_s **Core** -[https://github.com/tonlabs/sdk-samples/tree/master/core-examples/node-js/run\_executor](https://github.com/tonlabs/sdk-samples/tree/master/core-examples/node-js/run\_executor) +[https://github.com/everx-labs/sdk-samples/tree/master/core-examples/node-js/run\_executor](https://github.com/everx-labs/sdk-samples/tree/master/core-examples/node-js/run\_executor) **AppKit** -[https://github.com/tonlabs/sdk-samples/blob/master/appkit-examples/fee-calculation/index.js](https://github.com/tonlabs/sdk-samples/blob/master/appkit-examples/fee-calculation/index.js) +[https://github.com/everx-labs/sdk-samples/blob/master/appkit-examples/fee-calculation/index.js](https://github.com/everx-labs/sdk-samples/blob/master/appkit-examples/fee-calculation/index.js) diff --git a/docs/guides/work_with_contracts/external_signing.md b/docs/guides/work_with_contracts/external_signing.md index 5b5cb684a..5869b2f25 100644 --- a/docs/guides/work_with_contracts/external_signing.md +++ b/docs/guides/work_with_contracts/external_signing.md @@ -57,11 +57,11 @@ All the methods that create messages - `encode_message`, `process_message` can t **Core sample** -[https://github.com/tonlabs/sdk-samples/tree/master/core-examples/node-js/signingBox](https://github.com/tonlabs/sdk-samples/tree/master/core-examples/node-js/signingBox) +[https://github.com/everx-labs/sdk-samples/tree/master/core-examples/node-js/signingBox](https://github.com/everx-labs/sdk-samples/tree/master/core-examples/node-js/signingBox) **AppKit sample** -[https://github.com/tonlabs/sdk-samples/tree/master/appkit-examples/signing-box](https://github.com/tonlabs/sdk-samples/tree/master/appkit-examples/signing-box) +[https://github.com/everx-labs/sdk-samples/tree/master/appkit-examples/signing-box](https://github.com/everx-labs/sdk-samples/tree/master/appkit-examples/signing-box) ## Sign message outside sdk diff --git a/docs/guides/work_with_contracts/monitor-messages.md b/docs/guides/work_with_contracts/monitor-messages.md index 4d6b4bc8a..4aa213a2c 100644 --- a/docs/guides/work_with_contracts/monitor-messages.md +++ b/docs/guides/work_with_contracts/monitor-messages.md @@ -102,8 +102,8 @@ log("Starting use case #2") * Javascript: -[https://github.com/tonlabs/sdk-samples/tree/master/core-examples/node-js/message-monitor](https://github.com/tonlabs/sdk-samples/tree/master/core-examples/node-js/message-monitor) +[https://github.com/everx-labs/sdk-samples/tree/master/core-examples/node-js/message-monitor](https://github.com/everx-labs/sdk-samples/tree/master/core-examples/node-js/message-monitor) * Rust: -[https://github.com/tonlabs/sdk-samples/tree/master/core-examples/rust/message-monitoring](https://github.com/tonlabs/sdk-samples/tree/master/core-examples/rust/message-monitoring) +[https://github.com/everx-labs/sdk-samples/tree/master/core-examples/rust/message-monitoring](https://github.com/everx-labs/sdk-samples/tree/master/core-examples/rust/message-monitoring) diff --git a/docs/guides/work_with_contracts/run_abi_get_method.md b/docs/guides/work_with_contracts/run_abi_get_method.md index 445677289..448847eaa 100644 --- a/docs/guides/work_with_contracts/run_abi_get_method.md +++ b/docs/guides/work_with_contracts/run_abi_get_method.md @@ -52,7 +52,7 @@ async function runGetMethod(methodName, address, accountState) { const { message } = await client.abi.encode_message({ // Define contract ABI in the Application // See more info about ABI type here: - // https://github.com/tonlabs/ever-sdk/blob/master/docs/reference/types-and-methods/mod_abi.md#abi + // https://github.com/everx-labs/ever-sdk/blob/master/docs/reference/types-and-methods/mod_abi.md#abi abi: { type: 'Contract', value: HelloWallet.abi, @@ -67,7 +67,7 @@ async function runGetMethod(methodName, address, accountState) { // Execute `getTimestamp` get method (execute the message locally on TVM) // See more info about run_tvm method here: - // https://github.com/tonlabs/ever-sdk/blob/master/docs/reference/types-and-methods/mod_tvm.md#run_tvm + // https://github.com/everx-labs/ever-sdk/blob/master/docs/reference/types-and-methods/mod_tvm.md#run_tvm console.log('Run `getTimestamp` get method'); const response = await client.tvm.run_tvm({ message, @@ -83,6 +83,6 @@ async function runGetMethod(methodName, address, accountState) { ## Source code -[https://github.com/tonlabs/sdk-samples/blob/master/core-examples/node-js/hello-wallet/index.js](https://github.com/tonlabs/sdk-samples/blob/master/core-examples/node-js/hello-wallet/index.js) +[https://github.com/everx-labs/sdk-samples/blob/master/core-examples/node-js/hello-wallet/index.js](https://github.com/everx-labs/sdk-samples/blob/master/core-examples/node-js/hello-wallet/index.js) Check out [AppKit documentation](https://docs.everos.dev/appkit-js/guides/run\_abi\_get\_method) for this use case. diff --git a/docs/guides/work_with_contracts/run_fift_get_method.md b/docs/guides/work_with_contracts/run_fift_get_method.md index 2faba343c..1becb16ef 100644 --- a/docs/guides/work_with_contracts/run_fift_get_method.md +++ b/docs/guides/work_with_contracts/run_fift_get_method.md @@ -12,4 +12,4 @@ This is why we have a separate method for that in tvm module - [run_get](../../r Check this sample, demonstrating how to run get methods of elector contract: -[https://github.com/tonlabs/sdk-samples/blob/master/core-examples/node-js/run_get/index.js](https://github.com/tonlabs/sdk-samples/blob/master/core-examples/node-js/run_get/index.js) +[https://github.com/everx-labs/sdk-samples/blob/master/core-examples/node-js/run_get/index.js](https://github.com/everx-labs/sdk-samples/blob/master/core-examples/node-js/run_get/index.js) diff --git a/docs/guides/work_with_contracts/run_onchain.md b/docs/guides/work_with_contracts/run_onchain.md index 522854454..3c50e0587 100644 --- a/docs/guides/work_with_contracts/run_onchain.md +++ b/docs/guides/work_with_contracts/run_onchain.md @@ -9,11 +9,11 @@ Learn how to run methods of a contract on-chain > [See the API reference](../../reference/types-and-methods/modules.md). -Core api is more flexible than [AppKit](https://github.com/tonlabs/ever-appkit-js) and you can perform a lot of complex logic using it. But you will need to write more code with it as well :) +Core api is more flexible than [AppKit](https://github.com/everx-labs/ever-appkit-js) and you can perform a lot of complex logic using it. But you will need to write more code with it as well :) You need to [define the contract in your node.js](add\_contract\_to\_your\_app.md) application before running its methods. -Full sample: [https://github.com/tonlabs/sdk-samples/tree/master/core-examples/node-js/hello-wallet](https://github.com/tonlabs/sdk-samples/tree/master/core-examples/node-js/hello-wallet) +Full sample: [https://github.com/everx-labs/sdk-samples/tree/master/core-examples/node-js/hello-wallet](https://github.com/everx-labs/sdk-samples/tree/master/core-examples/node-js/hello-wallet) ## About run @@ -71,7 +71,7 @@ console.log(`Сontract run transaction with output ${response.decoded.output}, $ See the full sample in the repository with sdk samples: -[https://github.com/tonlabs/sdk-samples/tree/master/core-examples/node-js/hello-wallet](https://github.com/tonlabs/sdk-samples/tree/master/core-examples/node-js/hello-wallet) +[https://github.com/everx-labs/sdk-samples/tree/master/core-examples/node-js/hello-wallet](https://github.com/everx-labs/sdk-samples/tree/master/core-examples/node-js/hello-wallet) ### Pattern 2. Run in 3 steps: `encode_message` -> `send_message` -> `wait_for_transaction` @@ -104,7 +104,7 @@ Now the message should be sent. `sendMessage` method returns the the last block ```javascript // Send `touch` call message to the network // See more info about `send_message` here -// https://github.com/tonlabs/ever-sdk/blob/master/docs/mod_processing.md#send_message +// https://github.com/everx-labs/ever-sdk/blob/master/docs/mod_processing.md#send_message shard_block_id = (await client.processing.send_message({ message: encode_touch_result.message, send_events: true @@ -118,7 +118,7 @@ After the message was sent we need to wait for the transaction starting from the ```javascript // Monitor message delivery. // See more info about `wait_for_transaction` here -// https://github.com/tonlabs/ever-sdk/blob/master/docs/mod_processing.md#wait_for_transaction +// https://github.com/everx-labs/ever-sdk/blob/master/docs/mod_processing.md#wait_for_transaction const touch_processing_result = await client.processing.wait_for_transaction({ abi = { type: 'Contract', @@ -174,6 +174,6 @@ type TransactionFees = { } ``` -See the full example in sdk samples repository: [https://github.com/tonlabs/sdk-samples/blob/master/core-examples/node-js/hello-wallet/index\_pattern2.js](https://github.com/tonlabs/sdk-samples/blob/master/core-examples/node-js/hello-wallet/index\_pattern2.js) +See the full example in sdk samples repository: [https://github.com/everx-labs/sdk-samples/blob/master/core-examples/node-js/hello-wallet/index\_pattern2.js](https://github.com/everx-labs/sdk-samples/blob/master/core-examples/node-js/hello-wallet/index\_pattern2.js) Check out [AppKit documentation](https://docs.everos.dev/appkit-js/guides/run\_onchain) for this use case. diff --git a/docs/guides/work_with_contracts/trace-message-processing-with-remp.md b/docs/guides/work_with_contracts/trace-message-processing-with-remp.md index 17bf297a5..c78302620 100644 --- a/docs/guides/work_with_contracts/trace-message-processing-with-remp.md +++ b/docs/guides/work_with_contracts/trace-message-processing-with-remp.md @@ -133,7 +133,7 @@ function responseHandler(params, responseType) { See the full example in sdk samples repository: -[https://github.com/tonlabs/sdk-samples/blob/master/core-examples/node-js/remp/index.js](https://github.com/tonlabs/sdk-samples/blob/master/core-examples/node-js/remp/index.js) +[https://github.com/everx-labs/sdk-samples/blob/master/core-examples/node-js/remp/index.js](https://github.com/everx-labs/sdk-samples/blob/master/core-examples/node-js/remp/index.js) ## Expected output @@ -163,7 +163,7 @@ Transaction id: effed4849898e08d1fe5759532d34f23dbec061c5fd666604f817be82732cfb9 ## Sample Source code -Full sample: [https://github.com/tonlabs/sdk-samples/tree/master/core-examples/node-js/remp](https://github.com/tonlabs/sdk-samples/tree/master/core-examples/node-js/remp) +Full sample: [https://github.com/everx-labs/sdk-samples/tree/master/core-examples/node-js/remp](https://github.com/everx-labs/sdk-samples/tree/master/core-examples/node-js/remp) ## See also diff --git a/docs/guides/work_with_contracts/validate_address_convert_address.md b/docs/guides/work_with_contracts/validate_address_convert_address.md index ea595d3dd..b656002ce 100644 --- a/docs/guides/work_with_contracts/validate_address_convert_address.md +++ b/docs/guides/work_with_contracts/validate_address_convert_address.md @@ -37,4 +37,4 @@ If address is incorrect the function `utils.convert_address` will fail with an e ## Sample source code -[https://github.com/tonlabs/sdk-samples/blob/master/core-examples/node-js/utils.convert\_address/index.js](https://github.com/tonlabs/sdk-samples/blob/master/core-examples/node-js/utils.convert\_address/index.js) +[https://github.com/everx-labs/sdk-samples/blob/master/core-examples/node-js/utils.convert\_address/index.js](https://github.com/everx-labs/sdk-samples/blob/master/core-examples/node-js/utils.convert\_address/index.js) diff --git a/docs/guides/work_with_contracts/work_with_events.md b/docs/guides/work_with_contracts/work_with_events.md index cc1bc7a59..83a680a97 100644 --- a/docs/guides/work_with_contracts/work_with_events.md +++ b/docs/guides/work_with_contracts/work_with_events.md @@ -76,7 +76,7 @@ messages( ### Query -See the full sample here [https://github.com/tonlabs/sdk-samples/tree/master/core-examples/node-js/pagination](https://github.com/tonlabs/sdk-samples/tree/master/core-examples/node-js/pagination) +See the full sample here [https://github.com/everx-labs/sdk-samples/tree/master/core-examples/node-js/pagination](https://github.com/everx-labs/sdk-samples/tree/master/core-examples/node-js/pagination) Read about used API here -> [Account messages pagination](https://docs.everplatform.dev/samples/graphql-samples/accounts#get-messages-within-block-range). @@ -108,7 +108,7 @@ result = await client.net.query({ ### Subscribe -See the full sample here [https://github.com/tonlabs/sdk-samples/tree/master/core-examples/node-js/subscribe-and-decode](https://github.com/tonlabs/sdk-samples/tree/master/core-examples/node-js/subscribe-and-decode) +See the full sample here [https://github.com/everx-labs/sdk-samples/tree/master/core-examples/node-js/subscribe-and-decode](https://github.com/everx-labs/sdk-samples/tree/master/core-examples/node-js/subscribe-and-decode) To subscribe to all this. Don't forget to specify your own callback. @@ -126,7 +126,7 @@ const messageSubscription = await TonClient.default.net.subscribe_collection({ ### Decode -See the full sample here [https://github.com/tonlabs/sdk-samples/tree/master/core-examples/node-js/subscribe-and-decode](https://github.com/tonlabs/sdk-samples/tree/master/core-examples/node-js/subscribe-and-decode) +See the full sample here [https://github.com/everx-labs/sdk-samples/tree/master/core-examples/node-js/subscribe-and-decode](https://github.com/everx-labs/sdk-samples/tree/master/core-examples/node-js/subscribe-and-decode) ```javascript const decoded = (await TonClient.default.abi.decode_message({ diff --git a/docs/quick_start.md b/docs/quick_start.md index fcde4af6c..424121297 100644 --- a/docs/quick_start.md +++ b/docs/quick_start.md @@ -17,7 +17,7 @@ Node.js latest version installed [Docker](https://www.docker.com/get-started) la ## Prepare development environment -Install [EVERDEV CLI](https://github.com/tonlabs/everdev) that will help you easily start local node, compile your contracts, install demo projects and create new empty projects. +Install [EVERDEV CLI](https://github.com/everx-labs/everdev) that will help you easily start local node, compile your contracts, install demo projects and create new empty projects. ```shell $ npm install -g everdev @@ -25,7 +25,7 @@ $ npm install -g everdev ## Start local node (SE) -We will run our test on local blockchain for testing ([Evernode SE](https://github.com/tonlabs/evernode-se), start it with this command (docker should be launched). +We will run our test on local blockchain for testing ([Evernode SE](https://github.com/everx-labs/evernode-se), start it with this command (docker should be launched). ``` $ everdev se start @@ -45,8 +45,8 @@ $ npm i The script implements the following logic: -1. Links the project with Node.js [Ever-SDK](https://github.com/tonlabs/ever-sdk) binary. If you plan to use JS SDK in Web, link it with Wasm binary. Read more [here](https://github.com/tonlabs/ever-sdk-js). -2. `TONClient` instance is created and initialized with [Evernode SE](https://github.com/tonlabs/evernode-se) ("[http://localhost](http://localhost)", local blockchain) endpoint. See the list of other available [endpoints](https://docs.everplatform.dev/reference/graphql-api/networks). +1. Links the project with Node.js [Ever-SDK](https://github.com/everx-labs/ever-sdk) binary. If you plan to use JS SDK in Web, link it with Wasm binary. Read more [here](https://github.com/everx-labs/ever-sdk-js). +2. `TONClient` instance is created and initialized with [Evernode SE](https://github.com/everx-labs/evernode-se) ("[http://localhost](http://localhost)", local blockchain) endpoint. See the list of other available [endpoints](https://docs.everplatform.dev/reference/graphql-api/networks). 3. Future address is calculated from the code and data of the contract (data includes signing keys) 4. Flag `useGiver: true` allows to sponsor deploy with Evernode SE giver that is hard coded as the default Account giver. [You can re-assign it to your own giver](guides/work\_with\_contracts/deploy.md#transfer-funds-to-the-future-address). @@ -120,7 +120,7 @@ async function calcWalletAddress(keys) { function buildDeployOptions(keys) { // Prepare parameters for deploy message encoding // See more info about `encode_message` method parameters here: - // https://github.com/tonlabs/ever-sdk/blob/master/docs/reference/types-and-methods/mod_abi.md#encode_message + // https://github.com/everx-labs/ever-sdk/blob/master/docs/reference/types-and-methods/mod_abi.md#encode_message const deployOptions = { abi: { type: 'Contract', @@ -172,7 +172,7 @@ async function getTokensFromGiver(dest, value) { async function deployWallet(walletKeys) { // Deploy `Hello wallet` contract // See more info about `process_message` here: - // https://github.com/tonlabs/ever-sdk/blob/master/docs/reference/types-and-methods/mod_processing.md#process_message + // https://github.com/everx-labs/ever-sdk/blob/master/docs/reference/types-and-methods/mod_processing.md#process_message console.log('Deploying Hello wallet contract'); await client.processing.process_message({ send_events: false, @@ -261,7 +261,7 @@ async function runGetMethod(methodName, address, accountState) { const { message } = await client.abi.encode_message({ // Define contract ABI in the Application // See more info about ABI type here: - // https://github.com/tonlabs/ever-sdk/blob/master/docs/reference/types-and-methods/mod_abi.md#abi + // https://github.com/everx-labs/ever-sdk/blob/master/docs/reference/types-and-methods/mod_abi.md#abi abi: { type: 'Contract', value: HelloWallet.abi, @@ -276,7 +276,7 @@ async function runGetMethod(methodName, address, accountState) { // Execute `getTimestamp` get method (execute the message locally on TVM) // See more info about run_tvm method here: - // https://github.com/tonlabs/ever-sdk/blob/master/docs/reference/types-and-methods/mod_tvm.md#run_tvm + // https://github.com/everx-labs/ever-sdk/blob/master/docs/reference/types-and-methods/mod_tvm.md#run_tvm console.log('Run `getTimestamp` get method'); const response = await client.tvm.run_tvm({ message, @@ -306,7 +306,7 @@ async function sendValue(address, dest, amount, keys) { address, // Define contract ABI in the Application // See more info about ABI type here: - // https://github.com/tonlabs/ever-sdk/blob/master/docs/reference/types-and-methods/mod_abi.md#abi + // https://github.com/everx-labs/ever-sdk/blob/master/docs/reference/types-and-methods/mod_abi.md#abi abi: { type: 'Contract', value: HelloWallet.abi, @@ -465,4 +465,4 @@ The tokens were sent, but soon they will come back because bounce = true and des You can find full source code of this sample here -[https://github.com/tonlabs/sdk-samples/tree/master/demo/hello-wallet](https://github.com/tonlabs/sdk-samples/tree/master/demo/hello-wallet) +[https://github.com/everx-labs/sdk-samples/tree/master/demo/hello-wallet](https://github.com/everx-labs/sdk-samples/tree/master/demo/hello-wallet) diff --git a/docs/reference/error_codes.md b/docs/reference/error_codes.md index 1dd6f6efe..77e1e13c6 100644 --- a/docs/reference/error_codes.md +++ b/docs/reference/error_codes.md @@ -27,7 +27,7 @@ You can find error codes with descriptions on this page ## Solidity Runtime Errors -[https://github.com/tonlabs/TON-Solidity-Compiler/blob/master/API.md#solidity-runtime-errors](https://github.com/tonlabs/TON-Solidity-Compiler/blob/master/API.md#solidity-runtime-errors) +[https://github.com/everx-labs/TON-Solidity-Compiler/blob/master/API.md#solidity-runtime-errors](https://github.com/everx-labs/TON-Solidity-Compiler/blob/master/API.md#solidity-runtime-errors) ## TON Virtual Machine Runtime Errors diff --git a/docs/reference/rust-api/src/ton_client/abi/decode_data.rs.html b/docs/reference/rust-api/src/ton_client/abi/decode_data.rs.html index 5eb4aa3c3..0dc247292 100644 --- a/docs/reference/rust-api/src/ton_client/abi/decode_data.rs.html +++ b/docs/reference/rust-api/src/ton_client/abi/decode_data.rs.html @@ -55,7 +55,7 @@ use serde_json; use serde_json::Value; use std::sync::Arc; -use ton_abi::token::Detokenizer; +use ever_abi::token::Detokenizer; //---------------------------------------------------------------------------------- decode_message diff --git a/docs/reference/rust-api/src/ton_client/abi/decode_message.rs.html b/docs/reference/rust-api/src/ton_client/abi/decode_message.rs.html index 59640ad20..7f640c8b3 100644 --- a/docs/reference/rust-api/src/ton_client/abi/decode_message.rs.html +++ b/docs/reference/rust-api/src/ton_client/abi/decode_message.rs.html @@ -168,10 +168,10 @@ use crate::error::ClientResult; use serde_json::Value; use std::sync::Arc; -use ton_abi::contract::DecodedMessage; -use ton_abi::token::Detokenizer; +use ever_abi::contract::DecodedMessage; +use ever_abi::token::Detokenizer; use ton_sdk::AbiContract; -use ton_types::SliceData; +use ever_block::SliceData; #[derive(Serialize, Deserialize, ApiType, PartialEq, Debug, Clone)] pub enum MessageBodyType { @@ -279,7 +279,7 @@ async fn prepare_decode( context: &ClientContext, params: &ParamsOfDecodeMessage, -) -> ClientResult<(AbiContract, ton_block::Message)> { +) -> ClientResult<(AbiContract, ever_block::Message)> { let abi = params.abi.json_string()?; let abi = AbiContract::load(abi.as_bytes()).map_err(|x| Error::invalid_json(x))?; let message = deserialize_object_from_boc(context, &params.message, "message") @@ -301,7 +301,7 @@ } } else if let Ok(input) = abi.decode_input(body.clone(), is_internal) { let (header, _, _) = - ton_abi::Function::decode_header(abi.version().major, body.clone(), abi.header(), is_internal) + ever_abi::Function::decode_header(abi.version().major, body.clone(), abi.header(), is_internal) .map_err(|err| { Error::invalid_message_for_decode(format!( "Can't decode function header: {}", diff --git a/docs/reference/rust-api/src/ton_client/abi/encode_account.rs.html b/docs/reference/rust-api/src/ton_client/abi/encode_account.rs.html index b1880bd01..feb11eed9 100644 --- a/docs/reference/rust-api/src/ton_client/abi/encode_account.rs.html +++ b/docs/reference/rust-api/src/ton_client/abi/encode_account.rs.html @@ -192,8 +192,8 @@ use crate::error::ClientResult; use serde_json::Value; use std::sync::Arc; -use ton_block::GetRepresentationHash; -use ton_block::{ +use ever_block::GetRepresentationHash; +use ever_block::{ Account, CurrencyCollection, MsgAddressInt, StateInit, StateInitLib, }; @@ -266,7 +266,7 @@ message: &MessageSource, ) -> ClientResult<StateInit> { let (message, _) = message.encode(context).await?; - let message = deserialize_object_from_boc::<ton_block::Message>( + let message = deserialize_object_from_boc::<ever_block::Message>( context, &message, "message" ).await?.object; message diff --git a/docs/reference/rust-api/src/ton_client/abi/encode_message.rs.html b/docs/reference/rust-api/src/ton_client/abi/encode_message.rs.html index 825890afd..dac91df50 100644 --- a/docs/reference/rust-api/src/ton_client/abi/encode_message.rs.html +++ b/docs/reference/rust-api/src/ton_client/abi/encode_message.rs.html @@ -849,8 +849,8 @@ use serde_json::Value; use std::str::FromStr; use std::sync::Arc; -use ton_abi::Contract; -use ton_block::{MsgAddressInt, CurrencyCollection}; +use ever_abi::Contract; +use ever_block::{MsgAddressInt, CurrencyCollection}; use ton_sdk::{ContractImage, FunctionCallSet}; //--------------------------------------------------------------------------- encode_deploy_message @@ -1531,7 +1531,7 @@ let func = call.func.clone(); let (body, data_to_sign) = match params.signer { Signer::None => { - let body = ton_abi::encode_function_call( + let body = ever_abi::encode_function_call( abi.clone(), func.clone(), call.header, @@ -1544,7 +1544,7 @@ } _ => { if params.is_internal { - ton_abi::encode_function_call( + ever_abi::encode_function_call( abi.clone(), func.clone(), None, @@ -1553,7 +1553,7 @@ None, ).map(|body| (body, None)) } else { - ton_abi::prepare_function_call_for_sign( + ever_abi::prepare_function_call_for_sign( abi.clone(), func.clone(), call.header, @@ -1562,7 +1562,7 @@ }.map_err(|err| Error::encode_run_message_failed(err, &func))? } }; - let body: Vec<u8> = ton_types::serialize_toc( + let body: Vec<u8> = ever_block::serialize_toc( &body .clone() .into_cell() diff --git a/docs/reference/rust-api/src/ton_client/abi/internal.rs.html b/docs/reference/rust-api/src/ton_client/abi/internal.rs.html index cee5b4aff..454fdaaad 100644 --- a/docs/reference/rust-api/src/ton_client/abi/internal.rs.html +++ b/docs/reference/rust-api/src/ton_client/abi/internal.rs.html @@ -178,9 +178,9 @@ ) -> ClientResult<Vec<u8>> { let unsigned = ton_sdk::Contract::deserialize_tree_to_slice(unsigned_body) .map_err(|err| Error::attach_signature_failed(err))?; - let body = ton_abi::add_sign_to_function_call(abi.to_string(), signature, public_key, unsigned) + let body = ever_abi::add_sign_to_function_call(abi.to_string(), signature, public_key, unsigned) .map_err(|err| Error::attach_signature_failed(err))?; - Ok(ton_types::serialize_toc( + Ok(ever_block::serialize_toc( &body .into_cell() .map_err(|err| Error::attach_signature_failed(err))?, diff --git a/docs/reference/rust-api/src/ton_client/abi/types.rs.html b/docs/reference/rust-api/src/ton_client/abi/types.rs.html index ecc00d302..f09449389 100644 --- a/docs/reference/rust-api/src/ton_client/abi/types.rs.html +++ b/docs/reference/rust-api/src/ton_client/abi/types.rs.html @@ -207,7 +207,7 @@ use crate::error::ClientResult; use crate::{processing, ClientContext}; use std::sync::Arc; -use ton_abi::{Token, TokenValue}; +use ever_abi::{Token, TokenValue}; #[derive(Serialize, Deserialize, Clone, Debug, ApiType, Default)] pub struct AbiHandle(u32); @@ -241,8 +241,8 @@ } } - pub(crate) fn abi(&self) -> ClientResult<ton_abi::Contract> { - ton_abi::Contract::load(self.json_string()?.as_bytes()) + pub(crate) fn abi(&self) -> ClientResult<ever_abi::Contract> { + ever_abi::Contract::load(self.json_string()?.as_bytes()) .map_err(|x| Error::invalid_json(x)) } } diff --git a/docs/reference/rust-api/src/ton_client/boc/blockchain_config.rs.html b/docs/reference/rust-api/src/ton_client/boc/blockchain_config.rs.html index cc693b555..14893f692 100644 --- a/docs/reference/rust-api/src/ton_client/boc/blockchain_config.rs.html +++ b/docs/reference/rust-api/src/ton_client/boc/blockchain_config.rs.html @@ -104,7 +104,7 @@ use crate::boc::Error; use crate::client::ClientContext; use crate::error::ClientResult; -use ton_block::Serializable; +use ever_block::Serializable; use super::internal::deserialize_object_from_boc; #[derive(Serialize, Deserialize, Clone, ApiType, Default)] @@ -126,11 +126,11 @@ params: ParamsOfGetBlockchainConfig, ) -> ClientResult<ResultOfGetBlockchainConfig> { let config = if let Ok(block) = - deserialize_object_from_boc::<ton_block::Block>(&context, &params.block_boc, "block").await + deserialize_object_from_boc::<ever_block::Block>(&context, &params.block_boc, "block").await { extract_config_from_block(block.object)? } else { - let zerostate = deserialize_object_from_boc::<ton_block::ShardStateUnsplit>( + let zerostate = deserialize_object_from_boc::<ever_block::ShardStateUnsplit>( &context, &params.block_boc, "zerostate" ).await?; extract_config_from_zerostate(zerostate.object)? @@ -139,7 +139,7 @@ let cell = config.serialize() .map_err(|err| Error::serialization_error(err, "config to cells"))?; - let bytes = ton_types::serialize_toc(&cell) + let bytes = ever_block::serialize_toc(&cell) .map_err(|err| Error::serialization_error(err, "config cells to bytes"))?; Ok(ResultOfGetBlockchainConfig { @@ -147,7 +147,7 @@ }) } -pub(crate) fn extract_config_from_block(block: ton_block::Block) -> ClientResult<ton_block::ConfigParams> { +pub(crate) fn extract_config_from_block(block: ever_block::Block) -> ClientResult<ever_block::ConfigParams> { let extra = block .read_extra() .map_err(|err| Error::invalid_boc(format!("can not read `extra` from block: {}", err)))?; @@ -164,7 +164,7 @@ ))?.clone()) } -pub(crate) fn extract_config_from_zerostate(zerostate: ton_block::ShardStateUnsplit) -> ClientResult<ton_block::ConfigParams> { +pub(crate) fn extract_config_from_zerostate(zerostate: ever_block::ShardStateUnsplit) -> ClientResult<ever_block::ConfigParams> { let master = zerostate .read_custom() .map_err(|err| Error::invalid_boc(format!("can not read `master` from zerostate: {}", err)))? diff --git a/docs/reference/rust-api/src/ton_client/boc/cache.rs.html b/docs/reference/rust-api/src/ton_client/boc/cache.rs.html index 57bb563e1..a7b277d4a 100644 --- a/docs/reference/rust-api/src/ton_client/boc/cache.rs.html +++ b/docs/reference/rust-api/src/ton_client/boc/cache.rs.html @@ -342,7 +342,7 @@ use std::collections::{HashMap, HashSet}; use std::sync::Arc; use tokio::sync::{Mutex, RwLock}; -use ton_types::{Cell, UInt256}; +use ever_block::{Cell, UInt256}; pub const SHA256_SIZE: usize = 32; @@ -360,7 +360,7 @@ n } -fn calc_tree_cells(cell: &ton_types::Cell, hashes: &mut HashSet<ton_types::UInt256>) -> (usize, usize, usize) { +fn calc_tree_cells(cell: &ever_block::Cell, hashes: &mut HashSet<ever_block::UInt256>) -> (usize, usize, usize) { let bits = cell.bit_length(); let mut size = 2 + if cell.store_hashes() { (cell.level() as usize + 1) * (SHA256_SIZE + DEPTH_SIZE) } else { 0 } + @@ -383,7 +383,7 @@ (size, cell_count, refs_count) } -fn calc_tree_size(cell: &ton_types::Cell) -> usize { +fn calc_tree_size(cell: &ever_block::Cell) -> usize { let mut hashes = HashSet::new(); let (size, cell_count, refs_count) = calc_tree_cells(cell, &mut hashes); let ref_size = number_of_bytes_to_fit(cell_count); diff --git a/docs/reference/rust-api/src/ton_client/boc/encode.rs.html b/docs/reference/rust-api/src/ton_client/boc/encode.rs.html index 13dc20f56..87bff619f 100644 --- a/docs/reference/rust-api/src/ton_client/boc/encode.rs.html +++ b/docs/reference/rust-api/src/ton_client/boc/encode.rs.html @@ -313,7 +313,7 @@ use crate::{error::ClientResult, ClientContext}; use serde_json::Value; -use ton_types::{BuilderData, Cell, IBitstring}; +use ever_block::{BuilderData, Cell, IBitstring}; use super::{internal::serialize_cell_to_boc, Error}; use crate::boc::internal::deserialize_cell_from_boc; diff --git a/docs/reference/rust-api/src/ton_client/boc/internal.rs.html b/docs/reference/rust-api/src/ton_client/boc/internal.rs.html index d87e8e4a6..17288b875 100644 --- a/docs/reference/rust-api/src/ton_client/boc/internal.rs.html +++ b/docs/reference/rust-api/src/ton_client/boc/internal.rs.html @@ -194,8 +194,8 @@ use crate::{ClientContext}; use crate::boc::{BocCacheType, Error}; use crate::error::ClientResult; -use ton_block::{Deserializable, Serializable}; -use ton_types::{UInt256, deserialize_tree_of_cells}; +use ever_block::{Deserializable, Serializable}; +use ever_block::{UInt256, deserialize_tree_of_cells}; pub(crate) fn get_boc_hash(boc: &[u8]) -> ClientResult<String> { let cells = deserialize_tree_of_cells(&mut boc.clone()) @@ -207,11 +207,11 @@ pub(crate) fn deserialize_cell_from_base64( b64: &str, name: &str, -) -> ClientResult<(Vec<u8>, ton_types::Cell)> { +) -> ClientResult<(Vec<u8>, ever_block::Cell)> { let bytes = base64::decode(&b64) .map_err(|err| Error::invalid_boc(format!("error decode {} BOC base64: {}", name, err)))?; - let cell = ton_types::cells_serialization::deserialize_tree_of_cells(&mut bytes.as_slice()) + let cell = ever_block::cells_serialization::deserialize_tree_of_cells(&mut bytes.as_slice()) .map_err(|err| { Error::invalid_boc(format!("{} BOC deserialization error: {}", name, err)) })?; @@ -220,7 +220,7 @@ } pub(crate) fn deserialize_object_from_cell<S: Deserializable>( - cell: ton_types::Cell, + cell: ever_block::Cell, name: &str, ) -> ClientResult<S> { let tip = match name { @@ -242,7 +242,7 @@ #[derive(Clone)] pub(crate) enum DeserializedBoc { - Cell(ton_types::Cell), + Cell(ever_block::Cell), Bytes(Vec<u8>), } @@ -258,7 +258,7 @@ #[derive(Clone)] pub(crate) struct DeserializedObject<S: Deserializable> { pub boc: DeserializedBoc, - pub cell: ton_types::Cell, + pub cell: ever_block::Cell, pub object: S, } @@ -279,18 +279,18 @@ pub(crate) fn serialize_object_to_cell<S: Serializable>( object: &S, name: &str, -) -> ClientResult<ton_types::Cell> { +) -> ClientResult<ever_block::Cell> { Ok(object .serialize() .map_err(|err| Error::serialization_error(err, name))?) } -pub(crate) fn serialize_cell_to_bytes(cell: &ton_types::Cell, name: &str) -> ClientResult<Vec<u8>> { - ton_types::cells_serialization::serialize_toc(&cell) +pub(crate) fn serialize_cell_to_bytes(cell: &ever_block::Cell, name: &str) -> ClientResult<Vec<u8>> { + ever_block::cells_serialization::serialize_toc(&cell) .map_err(|err| Error::serialization_error(err, name)) } -pub(crate) fn serialize_cell_to_base64(cell: &ton_types::Cell, name: &str) -> ClientResult<String> { +pub(crate) fn serialize_cell_to_base64(cell: &ever_block::Cell, name: &str) -> ClientResult<String> { Ok(base64::encode(&serialize_cell_to_bytes(cell, name)?)) } @@ -304,7 +304,7 @@ pub(crate) async fn deserialize_cell_from_boc( context: &ClientContext, boc: &str, name: &str -) -> ClientResult<(DeserializedBoc, ton_types::Cell)> { +) -> ClientResult<(DeserializedBoc, ever_block::Cell)> { if boc.starts_with("*") { let hash = UInt256::from_str(&boc[1..]) .map_err(|err| Error::invalid_boc( @@ -337,7 +337,7 @@ } pub(crate) async fn serialize_cell_to_boc( - context: &ClientContext, cell: ton_types::Cell, name: &str, boc_cache: Option<BocCacheType>, + context: &ClientContext, cell: ever_block::Cell, name: &str, boc_cache: Option<BocCacheType>, ) -> ClientResult<String> { if let Some(cache_type) = boc_cache { context.bocs.add(cache_type, cell, None) diff --git a/docs/reference/rust-api/src/ton_client/boc/parse.rs.html b/docs/reference/rust-api/src/ton_client/boc/parse.rs.html index 1ca5e0abb..903892f52 100644 --- a/docs/reference/rust-api/src/ton_client/boc/parse.rs.html +++ b/docs/reference/rust-api/src/ton_client/boc/parse.rs.html @@ -260,23 +260,23 @@ context: std::sync::Arc<ClientContext>, params: ParamsOfParse, ) -> ClientResult<ResultOfParse> { - let object = deserialize_object_from_boc::<ton_block::Message>(&context, &params.boc, "message").await?; + let object = deserialize_object_from_boc::<ever_block::Message>(&context, &params.boc, "message").await?; - let set = ton_block_json::MessageSerializationSet { + let set = ever_block_json::MessageSerializationSet { block_id: None, boc: object.boc.bytes("message")?, id: object.cell.repr_hash(), message: object.object, proof: None, - status: ton_block::MessageProcessingStatus::Finalized, + status: ever_block::MessageProcessingStatus::Finalized, transaction_id: None, transaction_now: None, }; - let parsed = ton_block_json::db_serialize_message_ex( + let parsed = ever_block_json::db_serialize_message_ex( "id", &set, - ton_block_json::SerializationMode::QServer, + ever_block_json::SerializationMode::QServer, ) .map_err(|err| Error::serialization_error(err, "message"))?; @@ -294,22 +294,22 @@ params: ParamsOfParse, ) -> ClientResult<ResultOfParse> { let object = - deserialize_object_from_boc::<ton_block::Transaction>(&context, &params.boc, "transaction").await?; + deserialize_object_from_boc::<ever_block::Transaction>(&context, &params.boc, "transaction").await?; - let set = ton_block_json::TransactionSerializationSetEx { + let set = ever_block_json::TransactionSerializationSetEx { block_id: None, boc: &object.boc.bytes("transaction")?, id: &object.cell.repr_hash(), transaction: &object.object, proof: None, - status: ton_block::TransactionProcessingStatus::Finalized, + status: ever_block::TransactionProcessingStatus::Finalized, workchain_id: None, }; - let parsed = ton_block_json::db_serialize_transaction_ex( + let parsed = ever_block_json::db_serialize_transaction_ex( "id", set, - ton_block_json::SerializationMode::QServer, + ever_block_json::SerializationMode::QServer, ) .map_err(|err| Error::serialization_error(err, "transaction"))?; @@ -326,18 +326,18 @@ context: std::sync::Arc<ClientContext>, params: ParamsOfParse, ) -> ClientResult<ResultOfParse> { - let object = deserialize_object_from_boc::<ton_block::Account>(&context, &params.boc, "account").await?; + let object = deserialize_object_from_boc::<ever_block::Account>(&context, &params.boc, "account").await?; - let set = ton_block_json::AccountSerializationSet { + let set = ever_block_json::AccountSerializationSet { boc: object.boc.bytes("account")?, proof: None, account: object.object, }; - let parsed = ton_block_json::db_serialize_account_ex( + let parsed = ever_block_json::db_serialize_account_ex( "id", &set, - ton_block_json::SerializationMode::QServer, + ever_block_json::SerializationMode::QServer, ) .map_err(|err| Error::serialization_error(err, "account"))?; @@ -354,19 +354,19 @@ context: std::sync::Arc<ClientContext>, params: ParamsOfParse, ) -> ClientResult<ResultOfParse> { - let object = deserialize_object_from_boc::<ton_block::Block>(&context, &params.boc, "block").await?; + let object = deserialize_object_from_boc::<ever_block::Block>(&context, &params.boc, "block").await?; - let set = ton_block_json::BlockSerializationSet { + let set = ever_block_json::BlockSerializationSet { boc: object.boc.bytes("block")?, id: object.cell.repr_hash(), block: object.object, - status: ton_block::BlockProcessingStatus::Finalized, + status: ever_block::BlockProcessingStatus::Finalized, }; - let parsed = ton_block_json::db_serialize_block_ex( + let parsed = ever_block_json::db_serialize_block_ex( "id", &set, - ton_block_json::SerializationMode::QServer, + ever_block_json::SerializationMode::QServer, ) .map_err(|err| Error::serialization_error(err, "block"))?; @@ -384,9 +384,9 @@ params: ParamsOfParseShardstate, ) -> ClientResult<ResultOfParse> { let object = - deserialize_object_from_boc::<ton_block::ShardStateUnsplit>(&context, &params.boc, "shardstate").await?; + deserialize_object_from_boc::<ever_block::ShardStateUnsplit>(&context, &params.boc, "shardstate").await?; - let set = ton_block_json::ShardStateSerializationSet { + let set = ever_block_json::ShardStateSerializationSet { boc: object.boc.bytes("shardstate")?, id: params.id, state: object.object, @@ -394,10 +394,10 @@ workchain_id: params.workchain_id, }; - let parsed = ton_block_json::db_serialize_shard_state_ex( + let parsed = ever_block_json::db_serialize_shard_state_ex( "id", &set, - ton_block_json::SerializationMode::QServer, + ever_block_json::SerializationMode::QServer, ) .map_err(|err| Error::serialization_error(err, "shardstate"))?; diff --git a/docs/reference/rust-api/src/ton_client/boc/tvc.rs.html b/docs/reference/rust-api/src/ton_client/boc/tvc.rs.html index 283c3ccfc..b331678fc 100644 --- a/docs/reference/rust-api/src/ton_client/boc/tvc.rs.html +++ b/docs/reference/rust-api/src/ton_client/boc/tvc.rs.html @@ -82,7 +82,7 @@ context: std::sync::Arc<ClientContext>, params: ParamsOfGetCodeFromTvc, ) -> ClientResult<ResultOfGetCodeFromTvc> { - let object = deserialize_object_from_boc::<ton_block::StateInit>(&context, &params.tvc, "TVC").await?; + let object = deserialize_object_from_boc::<ever_block::StateInit>(&context, &params.tvc, "TVC").await?; let code = object.object.code.ok_or(Error::invalid_boc("TVC image has no code"))?; diff --git a/docs/reference/rust-api/src/ton_client/client/client.rs.html b/docs/reference/rust-api/src/ton_client/client/client.rs.html index 8492c46e9..973cfc687 100644 --- a/docs/reference/rust-api/src/ton_client/client/client.rs.html +++ b/docs/reference/rust-api/src/ton_client/client/client.rs.html @@ -280,7 +280,7 @@ pub(crate) debots: LockfreeMap<u32, Mutex<DEngine>>, pub(crate) boxes: Boxes, pub(crate) bocs: Bocs, - pub(crate) blockchain_config: RwLock<Option<Arc<ton_executor::BlockchainConfig>>>, + pub(crate) blockchain_config: RwLock<Option<Arc<ever_executor::BlockchainConfig>>>, pub(crate) app_requests: Mutex<HashMap<u32, oneshot::Sender<AppRequestResult>>>, diff --git a/docs/reference/rust-api/src/ton_client/debot/calltype.rs.html b/docs/reference/rust-api/src/ton_client/debot/calltype.rs.html index 025b3cb43..9ea78db10 100644 --- a/docs/reference/rust-api/src/ton_client/debot/calltype.rs.html +++ b/docs/reference/rust-api/src/ton_client/debot/calltype.rs.html @@ -511,8 +511,8 @@ use std::convert::TryFrom; use std::fmt::Display; use std::sync::Arc; -use ton_block::{Message, MsgAddressExt}; -use ton_types::{BuilderData, IBitstring, SliceData}; +use ever_block::{Message, MsgAddressExt}; +use ever_block::{BuilderData, IBitstring, SliceData}; use crate::net::{query_transaction_tree, ParamsOfQueryTransactionTree}; const SUPPORTED_ABI_VERSION: u8 = 2; diff --git a/docs/reference/rust-api/src/ton_client/debot/dengine.rs.html b/docs/reference/rust-api/src/ton_client/debot/dengine.rs.html index 228785507..eeabe2432 100644 --- a/docs/reference/rust-api/src/ton_client/debot/dengine.rs.html +++ b/docs/reference/rust-api/src/ton_client/debot/dengine.rs.html @@ -931,7 +931,7 @@ use crate::{ClientConfig, ClientContext}; use std::collections::VecDeque; use std::sync::Arc; -use ton_abi::Contract; +use ever_abi::Contract; use super::dinterface::{BuiltinInterfaces, DebotInterfaceExecutor}; use super::DEBOT_WC; use super::helpers::build_internal_message; diff --git a/docs/reference/rust-api/src/ton_client/debot/helpers.rs.html b/docs/reference/rust-api/src/ton_client/debot/helpers.rs.html index 879b5102e..6cd39b928 100644 --- a/docs/reference/rust-api/src/ton_client/debot/helpers.rs.html +++ b/docs/reference/rust-api/src/ton_client/debot/helpers.rs.html @@ -26,8 +26,8 @@ use crate::boc::internal::serialize_object_to_base64; use crate::encoding::account_decode; use crate::error::ClientResult; -use ton_block::{InternalMessageHeader, Message}; -use ton_types::SliceData; +use ever_block::{InternalMessageHeader, Message}; +use ever_block::SliceData; pub(super) fn build_internal_message( src: &String, diff --git a/docs/reference/rust-api/src/ton_client/debot/json_interface.rs.html b/docs/reference/rust-api/src/ton_client/debot/json_interface.rs.html index a3c9c890f..ea889a840 100644 --- a/docs/reference/rust-api/src/ton_client/debot/json_interface.rs.html +++ b/docs/reference/rust-api/src/ton_client/debot/json_interface.rs.html @@ -246,7 +246,7 @@ }; use crate::abi::Abi; use serde_json::Value; -use ton_abi::{Contract, param_type::ParamType, Param}; +use ever_abi::{Contract, param_type::ParamType, Param}; const ABI: &str = r#" { diff --git a/docs/reference/rust-api/src/ton_client/debot/msg_interface.rs.html b/docs/reference/rust-api/src/ton_client/debot/msg_interface.rs.html index 52acfddef..8d1271386 100644 --- a/docs/reference/rust-api/src/ton_client/debot/msg_interface.rs.html +++ b/docs/reference/rust-api/src/ton_client/debot/msg_interface.rs.html @@ -141,7 +141,7 @@ use crate::encoding::decode_abi_bigint; use serde_json::Value; use std::sync::Arc; -use ton_abi::Contract; +use ever_abi::Contract; use crate::abi::Signer; use crate::boc::{parse_message, ParamsOfParse}; use crate::debot::DEngine; diff --git a/docs/reference/rust-api/src/ton_client/debot/run_output.rs.html b/docs/reference/rust-api/src/ton_client/debot/run_output.rs.html index 3154c18c7..3298110d0 100644 --- a/docs/reference/rust-api/src/ton_client/debot/run_output.rs.html +++ b/docs/reference/rust-api/src/ton_client/debot/run_output.rs.html @@ -174,7 +174,7 @@ use crate::encoding::account_decode; use crate::error::ClientError; use std::collections::VecDeque; -use ton_block::{Message, MsgAddressInt}; +use ever_block::{Message, MsgAddressInt}; #[derive(Default)] pub(super) struct RunOutput { diff --git a/docs/reference/rust-api/src/ton_client/encoding.rs.html b/docs/reference/rust-api/src/ton_client/encoding.rs.html index fd55bd6df..b4fee785e 100644 --- a/docs/reference/rust-api/src/ton_client/encoding.rs.html +++ b/docs/reference/rust-api/src/ton_client/encoding.rs.html @@ -176,8 +176,8 @@ use std::str::FromStr; use num_bigint::BigInt; use num_traits::cast::NumCast; -use ton_block::MsgAddressInt; -use ton_types::SliceData; +use ever_block::MsgAddressInt; +use ever_block::SliceData; //------------------------------------------------------------------------------------------------------ diff --git a/docs/reference/rust-api/src/ton_client/error.rs.html b/docs/reference/rust-api/src/ton_client/error.rs.html index f0ea0414b..047022d00 100644 --- a/docs/reference/rust-api/src/ton_client/error.rs.html +++ b/docs/reference/rust-api/src/ton_client/error.rs.html @@ -283,7 +283,7 @@ self } - pub fn add_address(mut self, address: &ton_block::MsgAddressInt) -> ClientError { + pub fn add_address(mut self, address: &ever_block::MsgAddressInt) -> ClientError { self.data["account_address"] = address.to_string().into(); self } diff --git a/docs/reference/rust-api/src/ton_client/net/iterators/block.rs.html b/docs/reference/rust-api/src/ton_client/net/iterators/block.rs.html index d80e3b71d..f6f5d99f5 100644 --- a/docs/reference/rust-api/src/ton_client/net/iterators/block.rs.html +++ b/docs/reference/rust-api/src/ton_client/net/iterators/block.rs.html @@ -434,7 +434,7 @@ use crate::net::{query_collection, OrderBy, ParamsOfQueryCollection, SortDirection}; use crate::ClientContext; use serde::Serializer; -use ton_block::ShardIdent; +use ever_block::ShardIdent; pub const BLOCK_TRAVERSE_FIELDS: &str = r#" id diff --git a/docs/reference/rust-api/src/ton_client/net/iterators/block_iterator/branch.rs.html b/docs/reference/rust-api/src/ton_client/net/iterators/block_iterator/branch.rs.html index 9f23193d5..0ce69bbb5 100644 --- a/docs/reference/rust-api/src/ton_client/net/iterators/block_iterator/branch.rs.html +++ b/docs/reference/rust-api/src/ton_client/net/iterators/block_iterator/branch.rs.html @@ -88,7 +88,7 @@ use std::sync::Arc; -use ton_block::ShardIdent; +use ever_block::ShardIdent; use crate::error::ClientResult; use crate::net::iterators::block::BlockFields; diff --git a/docs/reference/rust-api/src/ton_client/net/iterators/block_iterator/filter.rs.html b/docs/reference/rust-api/src/ton_client/net/iterators/block_iterator/filter.rs.html index 583873c01..446023c66 100644 --- a/docs/reference/rust-api/src/ton_client/net/iterators/block_iterator/filter.rs.html +++ b/docs/reference/rust-api/src/ton_client/net/iterators/block_iterator/filter.rs.html @@ -108,7 +108,7 @@ * */ -use ton_block::ShardIdent; +use ever_block::ShardIdent; use crate::error::ClientResult; use crate::net::iterators::block::{shard_ident_parse, BlockFields}; diff --git a/docs/reference/rust-api/src/ton_client/net/iterators/block_iterator/mod.rs.html b/docs/reference/rust-api/src/ton_client/net/iterators/block_iterator/mod.rs.html index 7bcbb674b..fb65acf36 100644 --- a/docs/reference/rust-api/src/ton_client/net/iterators/block_iterator/mod.rs.html +++ b/docs/reference/rust-api/src/ton_client/net/iterators/block_iterator/mod.rs.html @@ -454,7 +454,7 @@ use crate::net::iterators::block_iterator::state::StateBuilder; use crate::net::iterators::{query_by_ids, register_iterator, ResultOfIteratorNext}; use crate::net::{query_collection, ChainIterator, ParamsOfQueryCollection, RegisteredIterator}; -use ton_block::ShardIdent; +use ever_block::ShardIdent; mod branch; mod filter; diff --git a/docs/reference/rust-api/src/ton_client/processing/blocks_walking.rs.html b/docs/reference/rust-api/src/ton_client/processing/blocks_walking.rs.html index cecc66cbe..bf4fb8302 100644 --- a/docs/reference/rust-api/src/ton_client/processing/blocks_walking.rs.html +++ b/docs/reference/rust-api/src/ton_client/processing/blocks_walking.rs.html @@ -229,8 +229,8 @@ use crate::error::ClientResult; use crate::net::{OrderBy, ParamsOfQueryCollection, ParamsOfWaitForCollection, SortDirection, BLOCKS_COLLECTION, Endpoint}; use std::sync::Arc; -use ton_block::MsgAddressInt; -use ton_block::MASTERCHAIN_ID; +use ever_block::MsgAddressInt; +use ever_block::MASTERCHAIN_ID; pub const BLOCK_FIELDS: &str = r#" id diff --git a/docs/reference/rust-api/src/ton_client/processing/errors.rs.html b/docs/reference/rust-api/src/ton_client/processing/errors.rs.html index ab75ed28f..5f0f4513a 100644 --- a/docs/reference/rust-api/src/ton_client/processing/errors.rs.html +++ b/docs/reference/rust-api/src/ton_client/processing/errors.rs.html @@ -234,7 +234,7 @@ use crate::error::{ClientError, format_time}; use serde_json::Value; -use ton_block::MsgAddressInt; +use ever_block::MsgAddressInt; #[derive(ApiType)] pub enum ErrorCode { diff --git a/docs/reference/rust-api/src/ton_client/processing/fetching.rs.html b/docs/reference/rust-api/src/ton_client/processing/fetching.rs.html index d860a9f7f..1ffb223e9 100644 --- a/docs/reference/rust-api/src/ton_client/processing/fetching.rs.html +++ b/docs/reference/rust-api/src/ton_client/processing/fetching.rs.html @@ -287,7 +287,7 @@ use serde_json::Value; use std::convert::TryFrom; use std::sync::Arc; -use ton_block::MsgAddressInt; +use ever_block::MsgAddressInt; use ton_sdk::Block; pub async fn fetch_next_shard_block<F: futures::Future<Output = ()> + Send>( diff --git a/docs/reference/rust-api/src/ton_client/processing/internal.rs.html b/docs/reference/rust-api/src/ton_client/processing/internal.rs.html index 25a9d7883..577fd597c 100644 --- a/docs/reference/rust-api/src/ton_client/processing/internal.rs.html +++ b/docs/reference/rust-api/src/ton_client/processing/internal.rs.html @@ -185,7 +185,7 @@ use crate::processing::Error; use crate::tvm::{AccountForExecutor, ExecutionOptions, ParamsOfRunExecutor}; use std::sync::Arc; -use ton_block::MsgAddressInt; +use ever_block::MsgAddressInt; use ton_sdk::{Block, MessageId}; /// Increments `retries` and returns `true` if `retries` hasn't reached `limit`. diff --git a/docs/reference/rust-api/src/ton_client/processing/send_message.rs.html b/docs/reference/rust-api/src/ton_client/processing/send_message.rs.html index 03d8a67cb..c306772d1 100644 --- a/docs/reference/rust-api/src/ton_client/processing/send_message.rs.html +++ b/docs/reference/rust-api/src/ton_client/processing/send_message.rs.html @@ -262,7 +262,7 @@ use crate::processing::types::ProcessingEvent; use crate::processing::Error; use std::sync::Arc; -use ton_block::{Message, MsgAddressInt}; +use ever_block::{Message, MsgAddressInt}; #[derive(Serialize, Deserialize, ApiType, Default, Debug, Clone)] pub struct ParamsOfSendMessage { @@ -320,7 +320,7 @@ ) -> ClientResult<Self> { // Check message let deserialized = - deserialize_object_from_boc::<ton_block::Message>(&context, serialized, "message") + deserialize_object_from_boc::<ever_block::Message>(&context, serialized, "message") .await?; let id = deserialized.cell.repr_hash().to_hex_string(); let dst = deserialized diff --git a/docs/reference/rust-api/src/ton_client/processing/wait_for_transaction.rs.html b/docs/reference/rust-api/src/ton_client/processing/wait_for_transaction.rs.html index c4c6caba7..33e285f01 100644 --- a/docs/reference/rust-api/src/ton_client/processing/wait_for_transaction.rs.html +++ b/docs/reference/rust-api/src/ton_client/processing/wait_for_transaction.rs.html @@ -221,7 +221,7 @@ // Prepare to wait let message = - deserialize_object_from_boc::<ton_block::Message>(&context, &params.message, "message") + deserialize_object_from_boc::<ever_block::Message>(&context, &params.message, "message") .await?; let message_id = message.cell.repr_hash().to_hex_string(); let address = message diff --git a/docs/reference/rust-api/src/ton_client/tvm/call_tvm.rs.html b/docs/reference/rust-api/src/ton_client/tvm/call_tvm.rs.html index be1a02240..60adfdf54 100644 --- a/docs/reference/rust-api/src/ton_client/tvm/call_tvm.rs.html +++ b/docs/reference/rust-api/src/ton_client/tvm/call_tvm.rs.html @@ -192,22 +192,22 @@ use crate::error::ClientResult; use crate::tvm::Error; use std::sync::Arc; -use ton_block::{ +use ever_block::{ Account, ConfigParams, CurrencyCollection, CommonMsgInfo, Deserializable, Serializable, OutActions, OutAction, Message, MsgAddressInt, }; -use ton_types::dictionary::HashmapType; -use ton_types::SliceData; -use ton_vm::executor::gas::gas_state::Gas; -use ton_vm::stack::{integer::IntegerData, savelist::SaveList, Stack, StackItem}; +use ever_block::dictionary::HashmapType; +use ever_block::SliceData; +use ever_vm::executor::gas::gas_state::Gas; +use ever_vm::stack::{integer::IntegerData, savelist::SaveList, Stack, StackItem}; pub(crate) fn call_tvm( account: &mut Account, options: ResolvedExecutionOptions, stack: Stack, -) -> ClientResult<ton_vm::executor::Engine> { +) -> ClientResult<ever_vm::executor::Engine> { let code = account.get_code().unwrap_or_default(); let data = account.get_data().ok_or_else(|| Error::invalid_account_boc("Account has no code"))?; let addr = account.get_addr().ok_or_else(|| Error::invalid_account_boc("Account has no address"))?; @@ -236,7 +236,7 @@ let gas_limit = 1_000_000_000; let gas = Gas::new(gas_limit, 0, gas_limit, 10); - let mut engine = ton_vm::executor::Engine::new().setup( + let mut engine = ever_vm::executor::Engine::new().setup( SliceData::from(code), Some(ctrls), Some(stack), @@ -245,14 +245,14 @@ match engine.execute() { Err(err) => { - let exception = ton_vm::error::tvm_exception(err) + let exception = ever_vm::error::tvm_exception(err) .map_err(|err| Error::unknown_execution_error(err))?; let code = if let Some(code) = exception.custom_code() { code } else { !(exception .exception_code() - .unwrap_or(ton_types::ExceptionCode::UnknownError) as i32) + .unwrap_or(ever_block::ExceptionCode::UnknownError) as i32) }; let exit_arg = super::stack::serialize_item(&exception.value)?; @@ -289,13 +289,13 @@ let mut stack = Stack::new(); let balance = account.balance().map(|cc| cc.grams.0).unwrap_or_default(); let function_selector = match msg.header() { - CommonMsgInfo::IntMsgInfo(_) => ton_vm::int!(0), - CommonMsgInfo::ExtInMsgInfo(_) => ton_vm::int!(-1), + CommonMsgInfo::IntMsgInfo(_) => ever_vm::int!(0), + CommonMsgInfo::ExtInMsgInfo(_) => ever_vm::int!(-1), CommonMsgInfo::ExtOutMsgInfo(_) => return Err(Error::invalid_message_type()), }; stack - .push(ton_vm::int!(balance)) // token balance of contract - .push(ton_vm::int!(0)) // token balance of msg + .push(ever_vm::int!(balance)) // token balance of contract + .push(ever_vm::int!(0)) // token balance of msg .push(StackItem::Cell(msg_cell.into())) // message .push(StackItem::Slice(msg.body().unwrap_or_default())) // message body .push(function_selector); // function selector @@ -332,9 +332,9 @@ block_unixtime: u32, block_lt: u64, tr_lt: u64, -) -> ton_vm::SmartContractInfo { +) -> ever_vm::SmartContractInfo { let mut info = - ton_vm::SmartContractInfo::with_myself(address.serialize().unwrap_or_default().into()); + ever_vm::SmartContractInfo::with_myself(address.serialize().unwrap_or_default().into()); *info.block_lt_mut() = block_lt; *info.trans_lt_mut() = tr_lt; *info.unix_time_mut() = block_unixtime; diff --git a/docs/reference/rust-api/src/ton_client/tvm/check_transaction.rs.html b/docs/reference/rust-api/src/ton_client/tvm/check_transaction.rs.html index 26ab6679f..cd8ba8581 100644 --- a/docs/reference/rust-api/src/ton_client/tvm/check_transaction.rs.html +++ b/docs/reference/rust-api/src/ton_client/tvm/check_transaction.rs.html @@ -112,7 +112,7 @@ use super::errors::Error; use crate::error::ClientResult; -use ton_block::AccStatusChange; +use ever_block::AccStatusChange; use ton_sdk::Transaction; pub(crate) async fn calc_transaction_fees<F>( @@ -123,7 +123,7 @@ show_tips_on_error: bool, ) -> ClientResult<ton_sdk::TransactionFees> where - F: futures::Future<Output = ClientResult<(ton_block::MsgAddressInt, u64)>>, + F: futures::Future<Output = ClientResult<(ever_block::MsgAddressInt, u64)>>, { if !transaction.is_aborted() || skip_check { return Ok(transaction.calc_fees()); @@ -147,7 +147,7 @@ show_tips: bool, ) -> ClientResult<()> where - F: futures::Future<Output = ClientResult<(ton_block::MsgAddressInt, u64)>>, + F: futures::Future<Output = ClientResult<(ever_block::MsgAddressInt, u64)>>, { if let Some(storage) = &transaction.storage { if storage.status_change != AccStatusChange::Unchanged { diff --git a/docs/reference/rust-api/src/ton_client/tvm/errors.rs.html b/docs/reference/rust-api/src/ton_client/tvm/errors.rs.html index 1ce6645c8..22edf9415 100644 --- a/docs/reference/rust-api/src/ton_client/tvm/errors.rs.html +++ b/docs/reference/rust-api/src/ton_client/tvm/errors.rs.html @@ -463,8 +463,8 @@ use crate::error::ClientError; use serde_json::Value; use std::fmt::Display; -use ton_block::{AccStatusChange, ComputeSkipReason, MsgAddressInt}; -use ton_types::{ExceptionCode, Cell}; +use ever_block::{AccStatusChange, ComputeSkipReason, MsgAddressInt}; +use ever_block::{ExceptionCode, Cell}; #[derive(ApiType)] pub enum ErrorCode { diff --git a/docs/reference/rust-api/src/ton_client/tvm/run_get.rs.html b/docs/reference/rust-api/src/ton_client/tvm/run_get.rs.html index e136901f8..98a327b56 100644 --- a/docs/reference/rust-api/src/ton_client/tvm/run_get.rs.html +++ b/docs/reference/rust-api/src/ton_client/tvm/run_get.rs.html @@ -118,8 +118,8 @@ use crate::error::ClientResult; use crate::tvm::Error; use std::sync::Arc; -use ton_vm::stack::integer::IntegerData; -use ton_vm::stack::{Stack, StackItem}; +use ever_vm::stack::integer::IntegerData; +use ever_vm::stack::{Stack, StackItem}; #[derive(Serialize, Deserialize, ApiType, Default, Clone)] pub struct ParamsOfRunGet { @@ -156,7 +156,7 @@ context: std::sync::Arc<ClientContext>, params: ParamsOfRunGet, ) -> ClientResult<ResultOfRunGet> { - let mut account: ton_block::Account = + let mut account: ever_block::Account = deserialize_object_from_boc(&context, &params.account, "account").await?.object; let options = ResolvedExecutionOptions::from_options(&context, params.execution_options).await?; diff --git a/docs/reference/rust-api/src/ton_client/tvm/run_message.rs.html b/docs/reference/rust-api/src/ton_client/tvm/run_message.rs.html index 0fcb4812a..bd72de511 100644 --- a/docs/reference/rust-api/src/ton_client/tvm/run_message.rs.html +++ b/docs/reference/rust-api/src/ton_client/tvm/run_message.rs.html @@ -457,10 +457,10 @@ use serde_json::Value; use std::convert::TryFrom; use std::sync::{atomic::AtomicU64, Arc}; -use ton_block::{Account, Message, Serializable, MsgAddressInt, CurrencyCollection, Transaction}; -use ton_executor::{ExecutorError, OrdinaryTransactionExecutor, TransactionExecutor}; +use ever_block::{Account, Message, Serializable, MsgAddressInt, CurrencyCollection, Transaction}; +use ever_executor::{ExecutorError, OrdinaryTransactionExecutor, TransactionExecutor}; use ton_sdk::TransactionFees; -use ton_types::Cell; +use ever_block::Cell; #[derive(Serialize, Deserialize, ApiType, Debug, Clone)] #[serde(tag = "type")] diff --git a/docs/reference/rust-api/src/ton_client/tvm/stack.rs.html b/docs/reference/rust-api/src/ton_client/tvm/stack.rs.html index a50eac842..fe5855adb 100644 --- a/docs/reference/rust-api/src/ton_client/tvm/stack.rs.html +++ b/docs/reference/rust-api/src/ton_client/tvm/stack.rs.html @@ -240,11 +240,11 @@ use crate::tvm::Error; use core::result::Result::{Err, Ok}; use serde_json::Value; -use ton_types::BuilderData; +use ever_block::BuilderData; use std::ops::Deref; use std::slice::Iter; -use ton_vm::stack::{continuation::ContinuationData, integer::IntegerData}; -use ton_vm::stack::StackItem; +use ever_vm::stack::{continuation::ContinuationData, integer::IntegerData}; +use ever_vm::stack::StackItem; enum ProcessingResult<'a> { Serialized(Value), @@ -327,7 +327,7 @@ Ok(items) } -fn serialize_integer_data(data: &ton_vm::stack::integer::IntegerData) -> String { +fn serialize_integer_data(data: &ever_vm::stack::integer::IntegerData) -> String { let hex = data.to_str_radix(16); // all negative numbers and positive numbers less than u128::MAX are encoded as decimal if hex.starts_with("-") || hex.len() <= 32 { diff --git a/docs/reference/rust-api/src/ton_client/tvm/types.rs.html b/docs/reference/rust-api/src/ton_client/tvm/types.rs.html index 7aae408c3..752ac334e 100644 --- a/docs/reference/rust-api/src/ton_client/tvm/types.rs.html +++ b/docs/reference/rust-api/src/ton_client/tvm/types.rs.html @@ -173,7 +173,7 @@ use crate::error::ClientResult; use crate::net::{OrderBy, SortDirection}; use std::sync::Arc; -use ton_executor::BlockchainConfig; +use ever_executor::BlockchainConfig; #[derive(Serialize, Deserialize, ApiType, Clone, Default)] pub struct ExecutionOptions { diff --git a/docs/reference/rust-api/src/ton_client/utils/calc_storage_fee.rs.html b/docs/reference/rust-api/src/ton_client/utils/calc_storage_fee.rs.html index a1e8eed20..2c70f7c76 100644 --- a/docs/reference/rust-api/src/ton_client/utils/calc_storage_fee.rs.html +++ b/docs/reference/rust-api/src/ton_client/utils/calc_storage_fee.rs.html @@ -104,7 +104,7 @@ context: Arc<ClientContext>, params: ParamsOfCalcStorageFee, ) -> ClientResult<ResultOfCalcStorageFee> { - let account = deserialize_object_from_boc::<ton_block::Account>( + let account = deserialize_object_from_boc::<ever_block::Account>( &context, &params.account, "account" ) .await? diff --git a/docs/reference/rust-api/src/ton_client/utils/conversion.rs.html b/docs/reference/rust-api/src/ton_client/utils/conversion.rs.html index 05681de79..18b3586f2 100644 --- a/docs/reference/rust-api/src/ton_client/utils/conversion.rs.html +++ b/docs/reference/rust-api/src/ton_client/utils/conversion.rs.html @@ -138,7 +138,7 @@ use crate::encoding::{account_decode, account_encode_ex, AccountAddressType, Base64AddressParams, decode_std_base64}; use crate::error::ClientResult; use std::sync::Arc; -use ton_block::MsgAddressInt; +use ever_block::MsgAddressInt; use std::str::FromStr; @@ -235,7 +235,7 @@ #[cfg(test)] pub fn abi_uint(n: u128, size: usize) -> serde_json::Value { - serde_json::to_value(ton_abi::TokenValue::Uint(ton_abi::Uint::new(n, size))) + serde_json::to_value(ever_abi::TokenValue::Uint(ever_abi::Uint::new(n, size))) .unwrap_or(Default::default()) } diff --git a/docs/reference/types-and-methods/mod_abi.md b/docs/reference/types-and-methods/mod_abi.md index 11e1b778f..17b957a75 100644 --- a/docs/reference/types-and-methods/mod_abi.md +++ b/docs/reference/types-and-methods/mod_abi.md @@ -724,7 +724,7 @@ NOTE: Sync version is available only for `lib-node` binding. Decodes BOC into JSON as a set of provided parameters. -Solidity functions use ABI types for [builder encoding](https://github.com/tonlabs/TON-Solidity-Compiler/blob/master/API.md#tvmbuilderstore). +Solidity functions use ABI types for [builder encoding](https://github.com/everx-labs/TON-Solidity-Compiler/blob/master/API.md#tvmbuilderstore). The simplest way to decode such a BOC is to use ABI decoding. ABI has it own rules for fields layout in cells so manually encoded BOC can not be described in terms of ABI rules. diff --git a/docs/reference/types-and-methods/mod_boc.md b/docs/reference/types-and-methods/mod_boc.md index 6b24c60c3..2e3908d87 100644 --- a/docs/reference/types-and-methods/mod_boc.md +++ b/docs/reference/types-and-methods/mod_boc.md @@ -4,7 +4,7 @@ BOC manipulation module. ## Functions -[decode_tvc](mod\_boc.md#decode_tvc) – Decodes tvc according to the tvc spec. Read more about tvc structure here https://github.com/tonlabs/ever-struct/blob/main/src/scheme/mod.rs#L30 +[decode_tvc](mod\_boc.md#decode_tvc) – Decodes tvc according to the tvc spec. Read more about tvc structure here https://github.com/everx-labs/ever-struct/blob/main/src/scheme/mod.rs#L30 [parse_message](mod\_boc.md#parse_message) – Parses message boc into a JSON @@ -139,7 +139,7 @@ BOC manipulation module. # Functions ## decode_tvc -Decodes tvc according to the tvc spec. Read more about tvc structure here https://github.com/tonlabs/ever-struct/blob/main/src/scheme/mod.rs#L30 +Decodes tvc according to the tvc spec. Read more about tvc structure here https://github.com/everx-labs/ever-struct/blob/main/src/scheme/mod.rs#L30 ```ts type ParamsOfDecodeTvc = { diff --git a/docs/reference/types-and-methods/modules.md b/docs/reference/types-and-methods/modules.md index 939c0548d..e01f91d34 100644 --- a/docs/reference/types-and-methods/modules.md +++ b/docs/reference/types-and-methods/modules.md @@ -163,7 +163,7 @@ Where: ## [boc](mod\_boc.md) – BOC manipulation module. -[decode_tvc](mod\_boc.md#decode_tvc) – Decodes tvc according to the tvc spec. Read more about tvc structure here https://github.com/tonlabs/ever-struct/blob/main/src/scheme/mod.rs#L30 +[decode_tvc](mod\_boc.md#decode_tvc) – Decodes tvc according to the tvc spec. Read more about tvc structure here https://github.com/everx-labs/ever-struct/blob/main/src/scheme/mod.rs#L30 [parse_message](mod\_boc.md#parse_message) – Parses message boc into a JSON diff --git a/examples/README.md b/examples/README.md index aba7023be..b687f94d0 100644 --- a/examples/README.md +++ b/examples/README.md @@ -1 +1 @@ -Examples on Rust can be found [here](https://github.com/tonlabs/sdk-samples/tree/master/core-examples/rust). +Examples on Rust can be found [here](https://github.com/everx-labs/sdk-samples/tree/master/core-examples/rust). diff --git a/ton_client/Cargo.toml b/ton_client/Cargo.toml index ffc4c95bd..44398ac2d 100644 --- a/ton_client/Cargo.toml +++ b/ton_client/Cargo.toml @@ -1,7 +1,7 @@ [package] name = 'ton_client' -version = '1.45.1' -authors = [ 'TON Labs LTD ' ] +version = '1.46.1' +authors = [ 'TON Labs LTD ' ] edition = '2018' license = 'Apache-2.0' build = 'build.rs' @@ -21,16 +21,15 @@ api_info = { path = '../api/info' } ton_sdk = { default-features = false, path = '../ton_sdk' } ton_client_processing = { default-features = false, path = '../ton_client_processing' } -ton_abi = { git = 'https://github.com/tonlabs/ever-abi.git', tag = '2.4.10' } -ton_block = { git = 'https://github.com/tonlabs/ever-block.git', tag = '1.9.118' } -ton_block_json = { git = 'https://github.com/tonlabs/ever-block-json.git', tag = '0.7.206' } -ton_types = { git = 'https://github.com/tonlabs/ever-types.git', tag = '2.0.31' } -ton_executor = { features = ['signature_with_id'], git = 'https://github.com/tonlabs/ever-executor.git', tag = '1.16.98' } -ton_vm = { features = ['signature_with_id', 'signature_no_check'], git = 'https://github.com/tonlabs/ever-vm.git', tag = '1.8.226' } -ever-struct = { git = 'https://github.com/tonlabs/ever-struct.git', tag = '1.0.14' } +ever_abi = { git = 'https://github.com/everx-labs/ever-abi.git', tag = '2.5.5' } +ever_block = { git = 'https://github.com/everx-labs/ever-block.git', tag = '1.10.4' } +ever_block_json = { git = 'https://github.com/everx-labs/ever-block-json.git', tag = '0.8.9' } +ever_executor = { features = ['signature_with_id'], git = 'https://github.com/everx-labs/ever-executor.git', tag = '1.17.9' } +ever_vm = { features = ['signature_with_id', 'signature_no_check'], git = 'https://github.com/everx-labs/ever-vm.git', tag = '2.1.7' } +ever-struct = { git = 'https://github.com/everx-labs/ever-struct.git', tag = '1.0.36' } -lockfree = { git = 'https://github.com/tonlabs/lockfree.git', package = 'lockfree' } -sodalite = { features = [ 'rand' ], git = 'https://github.com/tonlabs/sodalite.git' } +lockfree = { git = 'https://github.com/everx-labs/lockfree.git', package = 'lockfree' } +sodalite = { features = [ 'rand' ], git = 'https://github.com/everx-labs/sodalite.git' } aes = '0.7.4' @@ -111,7 +110,7 @@ pretty_assertions = '1.2' [features] default = [ 'std', 'native-tls' ] -include-zstd = [ 'ton_block/gosh', 'ton_vm/gosh' ] +include-zstd = [ 'ever_block/gosh', 'ever_vm/gosh' ] std = [ 'tokio/rt-multi-thread', 'tokio/macros', diff --git a/ton_client/build.rs b/ton_client/build.rs index 1af176644..9b420334b 100644 --- a/ton_client/build.rs +++ b/ton_client/build.rs @@ -69,7 +69,7 @@ impl BuildInfo { .iter() .filter(|x| { let source = x["source"].as_str().unwrap_or(""); - source.is_empty() || source.contains("tonlabs") + source.is_empty() || source.contains("everx-labs") }) .map(|x| { let name = x["name"].as_str().unwrap().to_string(); diff --git a/ton_client/src/abi/decode_boc.rs b/ton_client/src/abi/decode_boc.rs index 6656c627b..13b9f4c81 100644 --- a/ton_client/src/abi/decode_boc.rs +++ b/ton_client/src/abi/decode_boc.rs @@ -8,7 +8,7 @@ use serde_json; use serde_json::Value; use std::convert::TryInto; use std::sync::Arc; -use ton_abi::token::Detokenizer; +use ever_abi::token::Detokenizer; #[derive(Serialize, Deserialize, ApiType, Default)] pub struct ParamsOfDecodeBoc { @@ -31,7 +31,7 @@ pub struct ResultOfDecodeBoc { /// Decodes BOC into JSON as a set of provided parameters. /// -/// Solidity functions use ABI types for [builder encoding](https://github.com/tonlabs/TON-Solidity-Compiler/blob/master/API.md#tvmbuilderstore). +/// Solidity functions use ABI types for [builder encoding](https://github.com/everx-labs/TON-Solidity-Compiler/blob/master/API.md#tvmbuilderstore). /// The simplest way to decode such a BOC is to use ABI decoding. /// ABI has it own rules for fields layout in cells so manually encoded /// BOC can not be described in terms of ABI rules. @@ -59,10 +59,10 @@ pub fn decode_boc( abi_params.push(param.try_into()?) } - let tokens = ton_abi::TokenValue::decode_params( + let tokens = ever_abi::TokenValue::decode_params( &abi_params, slice_from_cell(data)?, - &ton_abi::contract::MAX_SUPPORTED_VERSION, + &ever_abi::contract::MAX_SUPPORTED_VERSION, params.allow_partial ) .map_err(|e| Error::invalid_data_for_decode(e))?; diff --git a/ton_client/src/abi/decode_data.rs b/ton_client/src/abi/decode_data.rs index 262f3b8dd..1d5ebd9bd 100644 --- a/ton_client/src/abi/decode_data.rs +++ b/ton_client/src/abi/decode_data.rs @@ -7,7 +7,7 @@ use crate::error::ClientResult; use serde_json; use serde_json::Value; use std::sync::Arc; -use ton_abi::token::Detokenizer; +use ever_abi::token::Detokenizer; #[derive(Serialize, Deserialize, ApiType, Default)] pub struct ParamsOfDecodeAccountData { diff --git a/ton_client/src/abi/decode_message.rs b/ton_client/src/abi/decode_message.rs index dc4637ce3..ca802e94b 100644 --- a/ton_client/src/abi/decode_message.rs +++ b/ton_client/src/abi/decode_message.rs @@ -6,10 +6,10 @@ use crate::client::ClientContext; use crate::error::ClientResult; use serde_json::Value; use std::sync::Arc; -use ton_abi::contract::DecodedMessage; -use ton_abi::token::Detokenizer; +use ever_abi::contract::DecodedMessage; +use ever_abi::token::Detokenizer; use ton_sdk::{AbiContract, AbiFunction, AbiEvent}; -use ton_types::SliceData; +use ever_block::SliceData; use super::types::extend_data_to_sign; @@ -69,7 +69,7 @@ impl DecodedMessageBody { body_type: MessageBodyType, decoded: DecodedMessage, header: Option, - ) -> ton_types::Result { + ) -> ever_block::Result { let value = Detokenizer::detokenize_to_json_value(&decoded.tokens)?; Ok(Self { body_type, @@ -115,9 +115,9 @@ pub fn decode_message( let (abi, message) = prepare_decode(&context, ¶ms)?; if let Some(body) = message.body() { let data_layout = match message.header() { - ton_block::CommonMsgInfo::ExtInMsgInfo(_) => Some(DataLayout::Input), - ton_block::CommonMsgInfo::ExtOutMsgInfo(_) => Some(DataLayout::Output), - ton_block::CommonMsgInfo::IntMsgInfo(_) => params.data_layout, + ever_block::CommonMsgInfo::ExtInMsgInfo(_) => Some(DataLayout::Input), + ever_block::CommonMsgInfo::ExtOutMsgInfo(_) => Some(DataLayout::Output), + ever_block::CommonMsgInfo::IntMsgInfo(_) => params.data_layout, }; decode_body(abi, body, message.is_internal(), params.allow_partial, params.function_name, data_layout) } else { @@ -170,7 +170,7 @@ pub fn decode_message_body( fn prepare_decode( context: &ClientContext, params: &ParamsOfDecodeMessage, -) -> ClientResult<(AbiContract, ton_block::Message)> { +) -> ClientResult<(AbiContract, ever_block::Message)> { let abi = params.abi.abi()?; let message = deserialize_object_from_boc(context, ¶ms.message, "message") .map_err(|x| Error::invalid_message_for_decode(x))?; @@ -215,7 +215,7 @@ fn decode_unknown_function( let input = abi.decode_input(body.clone(), is_internal, allow_partial) .map_err(|err| Error::invalid_message_for_decode(err))?; let (header, _, _) = - ton_abi::Function::decode_header(abi.version(), body.clone(), abi.header(), is_internal) + ever_abi::Function::decode_header(abi.version(), body.clone(), abi.header(), is_internal) .map_err(|err| { Error::invalid_message_for_decode(format!( "Can't decode function header: {}", @@ -266,7 +266,7 @@ fn decode_with_function( let decoded = function.decode_input(body.clone(), is_internal, allow_partial) .map_err(|err| Error::invalid_message_for_decode(err))?; let (header, _, _) = - ton_abi::Function::decode_header(abi.version(), body.clone(), abi.header(), is_internal) + ever_abi::Function::decode_header(abi.version(), body.clone(), abi.header(), is_internal) .map_err(|err| Error::invalid_message_for_decode(err))?; DecodedMessageBody::new( MessageBodyType::Input, @@ -357,7 +357,7 @@ pub async fn get_signature_data( params: ParamsOfGetSignatureData, ) -> ClientResult { let abi = params.abi.abi()?; - let message: ton_block::Message = deserialize_object_from_boc(&context, ¶ms.message, "message")?.object; + let message: ever_block::Message = deserialize_object_from_boc(&context, ¶ms.message, "message")?.object; if let Some(body) = message.body() { let address = message.dst() .ok_or_else(|| Error::invalid_message_for_decode( diff --git a/ton_client/src/abi/encode_account.rs b/ton_client/src/abi/encode_account.rs index e29184bc2..c171f7ceb 100644 --- a/ton_client/src/abi/encode_account.rs +++ b/ton_client/src/abi/encode_account.rs @@ -3,7 +3,7 @@ use crate::abi::Error; use crate::client::ClientContext; use crate::error::ClientResult; use std::sync::Arc; -use ton_block::{Account, CurrencyCollection, MsgAddressInt}; +use ever_block::{Account, CurrencyCollection, MsgAddressInt}; //--------------------------------------------------------------------------------- encode_account diff --git a/ton_client/src/abi/encode_boc.rs b/ton_client/src/abi/encode_boc.rs index 3cd1ea0dd..b5be6053a 100644 --- a/ton_client/src/abi/encode_boc.rs +++ b/ton_client/src/abi/encode_boc.rs @@ -2,9 +2,9 @@ use std::convert::TryInto; use std::sync::Arc; use serde_json::Value; -use ton_abi::contract::MAX_SUPPORTED_VERSION; -use ton_abi::token::Tokenizer; -use ton_abi::TokenValue; +use ever_abi::contract::MAX_SUPPORTED_VERSION; +use ever_abi::token::Tokenizer; +use ever_abi::TokenValue; use crate::abi::{AbiParam, Error}; use crate::boc::BocCacheType; diff --git a/ton_client/src/abi/encode_message.rs b/ton_client/src/abi/encode_message.rs index 36b6523f0..be9129e99 100644 --- a/ton_client/src/abi/encode_message.rs +++ b/ton_client/src/abi/encode_message.rs @@ -11,10 +11,10 @@ use crate::error::ClientResult; use serde_json::Value; use std::str::FromStr; use std::sync::Arc; -use ton_abi::Contract; -use ton_block::{CurrencyCollection, MsgAddressInt}; +use ever_abi::Contract; +use ever_block::{CurrencyCollection, MsgAddressInt}; use ton_sdk::{ContractImage, FunctionCallSet}; -use ton_types::Cell; +use ever_block::Cell; use super::types::extend_data_to_sign; @@ -815,7 +815,7 @@ pub async fn encode_message_body( let func = call.func.clone(); let (body, data_to_sign) = match params.signer { Signer::None => { - let body = ton_abi::encode_function_call( + let body = ever_abi::encode_function_call( &abi, &func, call.header.as_deref(), @@ -828,7 +828,7 @@ pub async fn encode_message_body( (body, None) } _ => if params.is_internal { - ton_abi::encode_function_call( + ever_abi::encode_function_call( &abi, &func, None, @@ -839,7 +839,7 @@ pub async fn encode_message_body( ) .map(|body| (body, None)) } else { - ton_abi::prepare_function_call_for_sign( + ever_abi::prepare_function_call_for_sign( &abi, &func, call.header.as_deref(), @@ -850,7 +850,7 @@ pub async fn encode_message_body( } .map_err(|err| Error::encode_run_message_failed(err, Some(&func)))?, }; - let body: Vec = ton_types::boc::write_boc( + let body: Vec = ever_block::boc::write_boc( &body .clone() .into_cell() diff --git a/ton_client/src/abi/errors.rs b/ton_client/src/abi/errors.rs index 85c99d23a..ed3db381e 100644 --- a/ton_client/src/abi/errors.rs +++ b/ton_client/src/abi/errors.rs @@ -128,7 +128,7 @@ impl Error { ) } - pub fn initial_pubkey_not_supported(abi_version: &ton_abi::contract::AbiVersion) -> ClientError { + pub fn initial_pubkey_not_supported(abi_version: &ever_abi::contract::AbiVersion) -> ClientError { error( ErrorCode::PubKeyNotSupported, format!( diff --git a/ton_client/src/abi/init_data.rs b/ton_client/src/abi/init_data.rs index b0413f5c3..c34639c36 100644 --- a/ton_client/src/abi/init_data.rs +++ b/ton_client/src/abi/init_data.rs @@ -10,7 +10,7 @@ use serde_json; use serde_json::Value; use std::convert::TryInto; use std::sync::Arc; -use ton_types::{Cell, SliceData}; +use ever_block::{Cell, SliceData}; #[derive(Serialize, Deserialize, ApiType, Default, Debug)] pub struct ParamsOfUpdateInitialData { @@ -74,7 +74,7 @@ fn update_initial_data_internal( Some(init_data) => { let abi = abi.json_string()?; let data = slice_from_cell(data)?; - ton_abi::json_abi::update_contract_data(&abi, &init_data.to_string(), data) + ever_abi::json_abi::update_contract_data(&abi, &init_data.to_string(), data) .map_err(|err| Error::encode_init_data_failed(err))? .into_cell() } @@ -88,7 +88,7 @@ fn update_initial_data_internal( .try_into() .map_err(|vec: Vec| Error::encode_init_data_failed(format!("invalid public key size {}", vec.len())))?; Ok( - ton_abi::Contract::insert_pubkey(data, &pubkey) + ever_abi::Contract::insert_pubkey(data, &pubkey) .map_err(|err| Error::encode_init_data_failed(err))? .into_cell(), ) @@ -98,7 +98,7 @@ fn update_initial_data_internal( } fn default_init_data() -> ClientResult { - ton_abi::Contract::insert_pubkey(Default::default(), &[0; ton_types::ED25519_PUBLIC_KEY_LENGTH]) + ever_abi::Contract::insert_pubkey(Default::default(), &[0; ever_block::ED25519_PUBLIC_KEY_LENGTH]) .map_err(|err| Error::encode_init_data_failed(err)) .map(SliceData::into_cell) } @@ -137,7 +137,7 @@ pub fn encode_initial_data( if params.initial_pubkey.is_some() { return Err(Error::initial_pubkey_not_supported(abi.version())); } - builder_to_cell(ton_abi::json_abi::encode_storage_fields( + builder_to_cell(ever_abi::json_abi::encode_storage_fields( ¶ms.abi.json_string()?, params.initial_data.map(|data| data.to_string()).as_deref(), ) @@ -204,10 +204,10 @@ pub fn decode_initial_data( .decode_data(data.clone(), params.allow_partial) .map_err(|e| Error::invalid_data_for_decode(e))?; - let initial_data = ton_abi::token::Detokenizer::detokenize_to_json_value(&tokens) + let initial_data = ever_abi::token::Detokenizer::detokenize_to_json_value(&tokens) .map_err(|e| Error::invalid_data_for_decode(e))?; - let initial_pubkey = ton_abi::Contract::get_pubkey(&data) + let initial_pubkey = ever_abi::Contract::get_pubkey(&data) .map_err(|e| Error::invalid_data_for_decode(e))? .ok_or_else(|| Error::invalid_data_for_decode("no public key in contract data"))?; diff --git a/ton_client/src/abi/internal.rs b/ton_client/src/abi/internal.rs index 4760b4e1c..b97bb4e5b 100644 --- a/ton_client/src/abi/internal.rs +++ b/ton_client/src/abi/internal.rs @@ -4,11 +4,11 @@ use crate::encoding::hex_decode; use crate::error::ClientResult; use crate::ClientContext; use serde_json::Value; -use ton_abi::PublicKeyData; +use ever_abi::PublicKeyData; use std::convert::TryInto; use std::sync::Arc; use ton_sdk::ContractImage; -use ton_types::Cell; +use ever_block::Cell; /// Combines `hex` encoded `signature` with `base64` encoded `unsigned_message`. /// Returns signed message encoded with `base64`. @@ -34,7 +34,7 @@ pub(crate) fn add_sign_to_message_body( ) -> ClientResult> { let unsigned = ton_sdk::Contract::deserialize_tree_to_slice(unsigned_body) .map_err(|err| Error::attach_signature_failed(err))?; - let body = ton_abi::add_sign_to_function_call( + let body = ever_abi::add_sign_to_function_call( abi, signature .try_into() @@ -46,7 +46,7 @@ pub(crate) fn add_sign_to_message_body( unsigned, ) .map_err(|err| Error::attach_signature_failed(err))?; - Ok(ton_types::boc::write_boc( + Ok(ever_block::boc::write_boc( &body .into_cell() .map_err(|err| Error::attach_signature_failed(err))?, @@ -100,7 +100,7 @@ pub(crate) fn create_tvc_image( /// Determines, if public key consists only zeroes, i.e. is empty. pub(crate) fn is_empty_pubkey(pubkey: &PublicKeyData) -> bool { - pubkey == &[0; ton_types::ED25519_PUBLIC_KEY_LENGTH] + pubkey == &[0; ever_block::ED25519_PUBLIC_KEY_LENGTH] } /// Resolves public key from deploy set, tvc or signer, using this priority: diff --git a/ton_client/src/abi/tests.rs b/ton_client/src/abi/tests.rs index e27899388..78825934e 100644 --- a/ton_client/src/abi/tests.rs +++ b/ton_client/src/abi/tests.rs @@ -28,12 +28,12 @@ use crate::boc::tvc::resolve_state_init_cell; use ever_struct::scheme::TVC; use serde_json::Value; use std::io::Cursor; -use ton_abi::{Contract, PublicKeyData}; -use ton_block::{ +use ever_abi::{Contract, PublicKeyData}; +use ever_block::{ CurrencyCollection, Deserializable, InternalMessageHeader, Message, Serializable, StateInit, }; use ton_sdk::ContractImage; -use ton_types::{BuilderData, IBitstring, Result}; +use ever_block::{BuilderData, IBitstring, Result}; use super::*; @@ -630,7 +630,7 @@ async fn test_encode_message_pubkey_internal( } fn gen_pubkey() -> PublicKeyData { - ton_types::ed25519_generate_private_key().unwrap().verifying_key() + ever_block::ed25519_generate_private_key().unwrap().verifying_key() } #[tokio::test(flavor = "multi_thread", worker_threads = 2)] @@ -1324,7 +1324,7 @@ async fn test_deploy_code_variants() -> Result<()> { .await?; let mut state_init = StateInit::default(); - state_init.set_code(ton_types::Cell::default()); + state_init.set_code(ever_block::Cell::default()); let tvc = serialize_object_to_base64(&state_init, "state init").unwrap(); test_deploy_code_variants_with_contract( (Abi::Json(TINY_ABI_V24.to_owned()), tvc), @@ -1553,11 +1553,11 @@ fn test_abi_v24_changes() { let client = TestClient::new(); let mut state_init = StateInit::default(); - state_init.set_code(ton_types::Cell::default()); + state_init.set_code(ever_block::Cell::default()); let tvc = serialize_object_to_base64(&state_init, "state init").unwrap(); let abi = Abi::Json(TINY_ABI_V24.to_owned()); - let empty_cell = serialize_cell_to_base64(&ton_types::Cell::default(), "data cell").unwrap(); + let empty_cell = serialize_cell_to_base64(&ever_block::Cell::default(), "data cell").unwrap(); let error = client .request::<_, ResultOfDecodeInitialData>( diff --git a/ton_client/src/abi/types.rs b/ton_client/src/abi/types.rs index 24d7aeca3..55ab2a742 100644 --- a/ton_client/src/abi/types.rs +++ b/ton_client/src/abi/types.rs @@ -3,7 +3,7 @@ use crate::error::{ClientError, ClientResult}; use crate::ClientContext; use std::convert::TryInto; use std::sync::Arc; -use ton_abi::{Token, TokenValue}; +use ever_abi::{Token, TokenValue}; #[derive(Serialize, Deserialize, Clone, Debug, ApiType, Default)] pub struct AbiHandle(u32); @@ -37,8 +37,8 @@ impl Abi { } } - pub fn abi(&self) -> ClientResult { - ton_abi::Contract::load(self.json_string()?.as_bytes()) + pub fn abi(&self) -> ClientResult { + ever_abi::Contract::load(self.json_string()?.as_bytes()) .map_err(|x| Error::invalid_json(x)) } } @@ -105,10 +105,10 @@ pub struct AbiParam { pub init: bool, } -impl TryInto for AbiParam { +impl TryInto for AbiParam { type Error = ClientError; - fn try_into(self) -> ClientResult { + fn try_into(self) -> ClientResult { serde_json::from_value( serde_json::to_value(&self) .map_err(|err| Error::invalid_json(err))? diff --git a/ton_client/src/boc/blockchain_config.rs b/ton_client/src/boc/blockchain_config.rs index 5f756d4f1..b51f4aae5 100644 --- a/ton_client/src/boc/blockchain_config.rs +++ b/ton_client/src/boc/blockchain_config.rs @@ -14,7 +14,7 @@ use crate::boc::Error; use crate::client::ClientContext; use crate::error::ClientResult; -use ton_block::Serializable; +use ever_block::Serializable; use super::internal::deserialize_object_from_boc; #[derive(Serialize, Deserialize, Clone, ApiType, Default)] @@ -36,11 +36,11 @@ pub fn get_blockchain_config( params: ParamsOfGetBlockchainConfig, ) -> ClientResult { let config = if let Ok(block) = - deserialize_object_from_boc::(&context, ¶ms.block_boc, "block") + deserialize_object_from_boc::(&context, ¶ms.block_boc, "block") { extract_config_from_block(&block.object)? } else { - let zerostate = deserialize_object_from_boc::( + let zerostate = deserialize_object_from_boc::( &context, ¶ms.block_boc, "zerostate" )?; extract_config_from_zerostate(&zerostate.object)? @@ -49,7 +49,7 @@ pub fn get_blockchain_config( let cell = config.serialize() .map_err(|err| Error::serialization_error(err, "config to cells"))?; - let bytes = ton_types::boc::write_boc(&cell) + let bytes = ever_block::boc::write_boc(&cell) .map_err(|err| Error::serialization_error(err, "config cells to bytes"))?; Ok(ResultOfGetBlockchainConfig { @@ -57,7 +57,7 @@ pub fn get_blockchain_config( }) } -pub(crate) fn extract_config_from_block(block: &ton_block::Block) -> ClientResult { +pub(crate) fn extract_config_from_block(block: &ever_block::Block) -> ClientResult { let extra = block .read_extra() .map_err(|err| Error::invalid_boc(format!("can not read `extra` from block: {}", err)))?; @@ -74,7 +74,7 @@ pub(crate) fn extract_config_from_block(block: &ton_block::Block) -> ClientResul ))?.clone()) } -pub(crate) fn extract_config_from_zerostate(zerostate: &ton_block::ShardStateUnsplit) -> ClientResult { +pub(crate) fn extract_config_from_zerostate(zerostate: &ever_block::ShardStateUnsplit) -> ClientResult { let master = zerostate .read_custom() .map_err(|err| Error::invalid_boc(format!("can not read `master` from zerostate: {}", err)))? diff --git a/ton_client/src/boc/cache.rs b/ton_client/src/boc/cache.rs index 950cbbe2c..c7e3f5118 100644 --- a/ton_client/src/boc/cache.rs +++ b/ton_client/src/boc/cache.rs @@ -25,7 +25,7 @@ use std::iter::FromIterator; #[allow(unused_imports)] use std::str::FromStr; use std::sync::{Arc, Mutex, RwLock}; -use ton_types::{Cell, UInt256}; +use ever_block::{Cell, UInt256}; pub const SHA256_SIZE: usize = 32; pub const DEPTH_SIZE: usize = 2; diff --git a/ton_client/src/boc/encode.rs b/ton_client/src/boc/encode.rs index c2701b47c..885bb8e89 100644 --- a/ton_client/src/boc/encode.rs +++ b/ton_client/src/boc/encode.rs @@ -2,8 +2,8 @@ use std::slice::Iter; use crate::{error::ClientResult, ClientContext}; use serde_json::Value; -use ton_block::Serializable; -use ton_types::{BuilderData, Cell, IBitstring}; +use ever_block::Serializable; +use ever_block::{BuilderData, Cell, IBitstring}; use super::{internal::serialize_cell_to_boc, Error}; use crate::boc::internal::deserialize_cell_from_boc; diff --git a/ton_client/src/boc/encode_external_in_message.rs b/ton_client/src/boc/encode_external_in_message.rs index 5fd4f591b..d55c55d7e 100644 --- a/ton_client/src/boc/encode_external_in_message.rs +++ b/ton_client/src/boc/encode_external_in_message.rs @@ -6,7 +6,7 @@ use crate::client::ClientContext; use crate::encoding::{account_decode, slice_from_cell}; use crate::error::ClientResult; use std::str::FromStr; -use ton_block::{ExternalInboundMessageHeader, GetRepresentationHash, MsgAddressExt, StateInit}; +use ever_block::{ExternalInboundMessageHeader, GetRepresentationHash, MsgAddressExt, StateInit}; #[derive(Serialize, Deserialize, Clone, Debug, ApiType, Default)] pub struct ParamsOfEncodeExternalInMessage { @@ -60,7 +60,7 @@ pub fn encode_external_in_message( ..Default::default() }; - let mut msg = ton_block::Message::with_ext_in_header(header); + let mut msg = ever_block::Message::with_ext_in_header(header); if let Some(init) = params.init { msg.set_state_init( deserialize_object_from_boc::(&context, &init, "state init")?.object, diff --git a/ton_client/src/boc/internal.rs b/ton_client/src/boc/internal.rs index 937928fb4..b4690b711 100644 --- a/ton_client/src/boc/internal.rs +++ b/ton_client/src/boc/internal.rs @@ -16,12 +16,12 @@ use crate::error::ClientResult; use crate::ClientContext; #[allow(unused_imports)] use std::str::FromStr; -use ton_block::{Deserializable, Serializable}; -use ton_types::UInt256; +use ever_block::{Deserializable, Serializable}; +use ever_block::UInt256; pub(crate) fn get_boc_hash(boc: &[u8]) -> ClientResult { let cells = - ton_types::boc::read_single_root_boc(&boc).map_err(|err| Error::invalid_boc(err))?; + ever_block::boc::read_single_root_boc(&boc).map_err(|err| Error::invalid_boc(err))?; let id: Vec = cells.repr_hash().as_slice()[..].into(); Ok(hex::encode(&id)) } @@ -29,11 +29,11 @@ pub(crate) fn get_boc_hash(boc: &[u8]) -> ClientResult { pub fn deserialize_cell_from_base64( b64: &str, name: &str, -) -> ClientResult<(Vec, ton_types::Cell)> { +) -> ClientResult<(Vec, ever_block::Cell)> { let bytes = base64::decode(&b64) .map_err(|err| Error::invalid_boc(format!("error decode {} BOC base64: {}", name, err)))?; - let cell = ton_types::boc::read_single_root_boc(&bytes).map_err(|err| { + let cell = ever_block::boc::read_single_root_boc(&bytes).map_err(|err| { Error::invalid_boc(format!("{} BOC deserialization error: {}", name, err)) })?; @@ -41,7 +41,7 @@ pub fn deserialize_cell_from_base64( } pub fn deserialize_object_from_cell( - cell: ton_types::Cell, + cell: ever_block::Cell, name: &str, ) -> ClientResult { let tip = match name { @@ -65,7 +65,7 @@ pub fn deserialize_object_from_cell( #[derive(Clone)] pub enum DeserializedBoc { - Cell(ton_types::Cell), + Cell(ever_block::Cell), Bytes(Vec), } @@ -81,7 +81,7 @@ impl DeserializedBoc { #[derive(Clone)] pub struct DeserializedObject { pub boc: DeserializedBoc, - pub cell: ton_types::Cell, + pub cell: ever_block::Cell, pub object: S, } @@ -102,18 +102,18 @@ pub fn deserialize_object_from_base64( pub fn serialize_object_to_cell( object: &S, name: &str, -) -> ClientResult { +) -> ClientResult { Ok(object .serialize() .map_err(|err| Error::serialization_error(err, name))?) } -pub fn serialize_cell_to_bytes(cell: &ton_types::Cell, name: &str) -> ClientResult> { - ton_types::boc::write_boc(&cell) +pub fn serialize_cell_to_bytes(cell: &ever_block::Cell, name: &str) -> ClientResult> { + ever_block::boc::write_boc(&cell) .map_err(|err| Error::serialization_error(err, name)) } -pub fn serialize_cell_to_base64(cell: &ton_types::Cell, name: &str) -> ClientResult { +pub fn serialize_cell_to_base64(cell: &ever_block::Cell, name: &str) -> ClientResult { Ok(base64::encode(&serialize_cell_to_bytes(cell, name)?)) } @@ -127,7 +127,7 @@ pub fn serialize_object_to_base64( pub fn deserialize_cell_from_boc( context: &ClientContext, boc: &str, name: &str -) -> ClientResult<(DeserializedBoc, ton_types::Cell)> { +) -> ClientResult<(DeserializedBoc, ever_block::Cell)> { context.bocs.deserialize_cell(boc, name) } @@ -145,7 +145,7 @@ pub fn deserialize_object_from_boc_bin( boc: &[u8], ) -> ClientResult<(S, UInt256)> { let cell = - ton_types::boc::read_single_root_boc(&boc).map_err(|err| Error::invalid_boc(err))?; + ever_block::boc::read_single_root_boc(&boc).map_err(|err| Error::invalid_boc(err))?; let root_hash = cell.repr_hash(); let object = S::construct_from_cell(cell).map_err(|err| Error::invalid_boc(err))?; @@ -153,7 +153,7 @@ pub fn deserialize_object_from_boc_bin( } pub fn serialize_cell_to_boc( - context: &ClientContext, cell: ton_types::Cell, name: &str, boc_cache: Option, + context: &ClientContext, cell: ever_block::Cell, name: &str, boc_cache: Option, ) -> ClientResult { if let Some(cache_type) = boc_cache { context diff --git a/ton_client/src/boc/parse.rs b/ton_client/src/boc/parse.rs index f1c8ced60..b4691e8dc 100644 --- a/ton_client/src/boc/parse.rs +++ b/ton_client/src/boc/parse.rs @@ -16,7 +16,7 @@ use crate::boc::Error; use crate::client::ClientContext; use crate::error::ClientResult; use serde_json::Value; -use ton_block::Deserializable; +use ever_block::Deserializable; use super::internal::{deserialize_cell_from_boc, deserialize_object_from_cell}; @@ -50,24 +50,24 @@ pub fn parse_message( context: std::sync::Arc, params: ParamsOfParse, ) -> ClientResult { - let object = deserialize_object_from_boc::(&context, ¶ms.boc, "message")?; + let object = deserialize_object_from_boc::(&context, ¶ms.boc, "message")?; - let set = ton_block_json::MessageSerializationSet { + let set = ever_block_json::MessageSerializationSet { block_id: None, boc: object.boc.bytes("message")?, id: object.cell.repr_hash(), message: object.object, proof: None, - status: ton_block::MessageProcessingStatus::Finalized, + status: ever_block::MessageProcessingStatus::Finalized, transaction_id: None, transaction_now: None, ..Default::default() }; - let parsed = ton_block_json::db_serialize_message_ex( + let parsed = ever_block_json::db_serialize_message_ex( "id", &set, - ton_block_json::SerializationMode::QServer, + ever_block_json::SerializationMode::QServer, ) .map_err(|err| Error::serialization_error(err, "message"))?; @@ -85,22 +85,22 @@ pub fn parse_transaction( params: ParamsOfParse, ) -> ClientResult { let object = - deserialize_object_from_boc::(&context, ¶ms.boc, "transaction")?; + deserialize_object_from_boc::(&context, ¶ms.boc, "transaction")?; - let set = ton_block_json::TransactionSerializationSetEx { + let set = ever_block_json::TransactionSerializationSetEx { block_id: None, boc: &object.boc.bytes("transaction")?, id: &object.cell.repr_hash(), transaction: &object.object, proof: None, - status: ton_block::TransactionProcessingStatus::Finalized, + status: ever_block::TransactionProcessingStatus::Finalized, workchain_id: None }; - let parsed = ton_block_json::db_serialize_transaction_ex( + let parsed = ever_block_json::db_serialize_transaction_ex( "id", set, - ton_block_json::SerializationMode::QServer, + ever_block_json::SerializationMode::QServer, ) .map_err(|err| Error::serialization_error(err, "transaction"))?; @@ -119,8 +119,8 @@ pub fn parse_account( ) -> ClientResult { let (boc, cell) = deserialize_cell_from_boc(&context, ¶ms.boc, "account")?; - let account = if cell.cell_type() == ton_types::CellType::MerkleProof { - let proof = ton_block::MerkleProof::construct_from_cell(cell) + let account = if cell.cell_type() == ever_block::CellType::MerkleProof { + let proof = ever_block::MerkleProof::construct_from_cell(cell) .map_err(|err| Error::invalid_boc(format!("Can not deserialize Merkle proof from pruned account BOC: {}", err)))?; proof.virtualize() .map_err(|err| Error::invalid_boc(format!("Can not virtualize pruned account from Merkle proof: {}", err)))? @@ -128,17 +128,17 @@ pub fn parse_account( deserialize_object_from_cell(cell, "account")? }; - let set = ton_block_json::AccountSerializationSet { + let set = ever_block_json::AccountSerializationSet { boc: boc.bytes("account")?, proof: None, account, ..Default::default() }; - let parsed = ton_block_json::db_serialize_account_ex( + let parsed = ever_block_json::db_serialize_account_ex( "id", &set, - ton_block_json::SerializationMode::QServer, + ever_block_json::SerializationMode::QServer, ) .map_err(|err| Error::serialization_error(err, "account"))?; @@ -155,20 +155,20 @@ pub fn parse_block( context: std::sync::Arc, params: ParamsOfParse, ) -> ClientResult { - let object = deserialize_object_from_boc::(&context, ¶ms.boc, "block")?; + let object = deserialize_object_from_boc::(&context, ¶ms.boc, "block")?; - let set = ton_block_json::BlockSerializationSet { + let set = ever_block_json::BlockSerializationSet { boc: object.boc.bytes("block")?, id: object.cell.repr_hash(), block: object.object, - status: ton_block::BlockProcessingStatus::Finalized, + status: ever_block::BlockProcessingStatus::Finalized, ..Default::default() }; - let parsed = ton_block_json::db_serialize_block_ex( + let parsed = ever_block_json::db_serialize_block_ex( "id", &set, - ton_block_json::SerializationMode::QServer, + ever_block_json::SerializationMode::QServer, ) .map_err(|err| Error::serialization_error(err, "block"))?; @@ -186,9 +186,9 @@ pub fn parse_shardstate( params: ParamsOfParseShardstate, ) -> ClientResult { let object = - deserialize_object_from_boc::(&context, ¶ms.boc, "shardstate")?; + deserialize_object_from_boc::(&context, ¶ms.boc, "shardstate")?; - let set = ton_block_json::ShardStateSerializationSet { + let set = ever_block_json::ShardStateSerializationSet { boc: object.boc.bytes("shardstate")?, id: params.id, state: object.object, @@ -197,10 +197,10 @@ pub fn parse_shardstate( ..Default::default() }; - let parsed = ton_block_json::db_serialize_shard_state_ex( + let parsed = ever_block_json::db_serialize_shard_state_ex( "id", &set, - ton_block_json::SerializationMode::QServer, + ever_block_json::SerializationMode::QServer, ) .map_err(|err| Error::serialization_error(err, "shardstate"))?; diff --git a/ton_client/src/boc/reader/query.rs b/ton_client/src/boc/reader/query.rs index c046c172e..e2e9e21a1 100644 --- a/ton_client/src/boc/reader/query.rs +++ b/ton_client/src/boc/reader/query.rs @@ -14,8 +14,8 @@ use serde_json::Value; use crate::error::{ClientResult, ClientError}; use super::parser::{CellQuery, CellFieldReader, CellValueReader}; -use ton_types::{Cell, SliceData, HashmapE, HashmapType}; -use ton_block::types::Grams; +use ever_block::{Cell, SliceData, HashmapE, HashmapType}; +use ever_block::types::Grams; fn read_value(slice: &mut SliceData, reader: &CellValueReader) -> ClientResult { Ok(match reader { diff --git a/ton_client/src/boc/state_init.rs b/ton_client/src/boc/state_init.rs index c939facf0..741ca5474 100644 --- a/ton_client/src/boc/state_init.rs +++ b/ton_client/src/boc/state_init.rs @@ -11,8 +11,8 @@ * limitations under the License. */ -use ton_block::{Number5, StateInit, StateInitLib, TickTock}; -use ton_types::{BuilderData, Cell}; +use ever_block::{Number5, StateInit, StateInitLib, TickTock, SERDE_OPTS_EMPTY}; +use ever_block::{BuilderData, Cell}; use super::BocCacheType; use crate::boc::internal::{ @@ -325,7 +325,7 @@ pub fn encode_state_init( }; let code = get_cell("code", params.code.as_deref())?; let data = get_cell("data", params.data.as_deref())?; - let library = StateInitLib::with_hashmap(get_cell("library", params.library.as_deref())?); + let library = StateInitLib::with_hashmap(get_cell("library", params.library.as_deref())?, SERDE_OPTS_EMPTY); let special = if params.tick.is_some() || params.tock.is_some() { Some(TickTock { diff --git a/ton_client/src/boc/tests.rs b/ton_client/src/boc/tests.rs index 3e19769a9..78f133ec8 100644 --- a/ton_client/src/boc/tests.rs +++ b/ton_client/src/boc/tests.rs @@ -25,8 +25,8 @@ use internal::serialize_cell_to_base64; use pretty_assertions::assert_eq; use serde_json::Value; use std::str::FromStr; -use ton_block::{MsgAddrStd, MsgAddressInt, Serializable}; -use ton_types::{AccountId, BuilderData, IBitstring}; +use ever_block::{MsgAddrStd, MsgAddressInt, Serializable}; +use ever_block::{AccountId, BuilderData, IBitstring}; #[test] fn test_encode_boc() { @@ -495,7 +495,7 @@ fn parse_account() { fn parse_pruned_account() { let client = TestClient::new(); - let (account, _) = deserialize_object_from_boc_bin::(include_bytes!("test_data/account.boc")).unwrap(); + let (account, _) = deserialize_object_from_boc_bin::(include_bytes!("test_data/account.boc")).unwrap(); let code = account.get_code().map(|cell| cell.repr_hash()); let data = account.get_data().map(|cell| cell.repr_hash()); @@ -503,7 +503,7 @@ fn parse_pruned_account() { let cell = account.serialize().unwrap(); - let proof = ton_block::MerkleProof::create( + let proof = ever_block::MerkleProof::create( &cell, |hash| Some(hash) != code.as_ref() && Some(hash) != data.as_ref() && Some(hash) != libs.as_ref() ).unwrap(); diff --git a/ton_client/src/boc/tvc.rs b/ton_client/src/boc/tvc.rs index 0f56a6236..3bcc2d723 100644 --- a/ton_client/src/boc/tvc.rs +++ b/ton_client/src/boc/tvc.rs @@ -21,8 +21,8 @@ use crate::boc::internal::{ use crate::error::ClientResult; use crate::ClientContext; use ever_struct::scheme::TVC; -use ton_block::{StateInit, Deserializable}; -use ton_types::Cell; +use ever_block::{StateInit, Deserializable}; +use ever_block::Cell; #[derive(Serialize, Deserialize, ApiType, Default)] pub struct ParamsOfDecodeTvc { @@ -49,7 +49,7 @@ pub struct TvcV1 { } /// Decodes tvc according to the tvc spec. -/// Read more about tvc structure here https://github.com/tonlabs/ever-struct/blob/main/src/scheme/mod.rs#L30 +/// Read more about tvc structure here https://github.com/everx-labs/ever-struct/blob/main/src/scheme/mod.rs#L30 #[api_function] pub fn decode_tvc( diff --git a/ton_client/src/client/client.rs b/ton_client/src/client/client.rs index 529b821ae..96fe857c3 100644 --- a/ton_client/src/client/client.rs +++ b/ton_client/src/client/client.rs @@ -48,7 +48,7 @@ pub struct Boxes { #[derive(Clone, Default)] pub(crate) struct NetworkParams { - pub(crate) blockchain_config: Arc, + pub(crate) blockchain_config: Arc, pub(crate) global_id: i32, } diff --git a/ton_client/src/client/client_env_tests.rs b/ton_client/src/client/client_env_tests.rs index fff691609..852043d2e 100644 --- a/ton_client/src/client/client_env_tests.rs +++ b/ton_client/src/client/client_env_tests.rs @@ -1,4 +1,4 @@ -use ton_types::Result; +use ever_block::Result; use crate::client::LocalStorage; use crate::client::storage::KeyValueStorage; diff --git a/ton_client/src/crypto/tests.rs b/ton_client/src/crypto/tests.rs index 021ce3b3a..a9c7bbc99 100644 --- a/ton_client/src/crypto/tests.rs +++ b/ton_client/src/crypto/tests.rs @@ -1268,7 +1268,7 @@ fn password_provider( } #[tokio::test] -async fn test_crypto_boxes() -> ton_types::Result<()> { +async fn test_crypto_boxes() -> ever_block::Result<()> { let client = Arc::new(TestClient::new()); let password_hash = Arc::new("1234567890ABCDEF1234567890ABCDEF1234567890ABCDEF1234567890ABCDEF".to_string()); @@ -1362,7 +1362,7 @@ async fn test_crypto_boxes() -> ton_types::Result<()> { } #[tokio::test] -async fn test_crypto_box_signing_boxes() -> ton_types::Result<()> { +async fn test_crypto_box_signing_boxes() -> ever_block::Result<()> { let client = Arc::new(TestClient::new()); let password_hash = Arc::new("1234567890ABCDEF1234567890ABCDEF1234567890ABCDEF1234567890ABCDEF".to_string()); @@ -1480,7 +1480,7 @@ async fn test_crypto_box_signing_boxes() -> ton_types::Result<()> { } #[tokio::test] -async fn test_crypto_box_encryption_boxes() -> ton_types::Result<()> { +async fn test_crypto_box_encryption_boxes() -> ever_block::Result<()> { let client = Arc::new(TestClient::new()); let password_hash = Arc::new("1234567890ABCDEF1234567890ABCDEF1234567890ABCDEF1234567890ABCDEF".to_string()); @@ -1616,7 +1616,7 @@ async fn test_crypto_box_encryption_boxes() -> ton_types::Result<()> { } #[tokio::test] -async fn test_crypto_box_derive_key_cache() -> ton_types::Result<()> { +async fn test_crypto_box_derive_key_cache() -> ever_block::Result<()> { let client = Arc::new(TestClient::new()); let password_hash = Arc::new("1234567890ABCDEF1234567890ABCDEF1234567890ABCDEF1234567890ABCDEF".to_string()); diff --git a/ton_client/src/debot/calltype.rs b/ton_client/src/debot/calltype.rs index 3d9cf58f5..5679a0d6a 100644 --- a/ton_client/src/debot/calltype.rs +++ b/ton_client/src/debot/calltype.rs @@ -16,8 +16,8 @@ use crate::tvm::{run_executor, run_tvm, AccountForExecutor, ParamsOfRunExecutor, use std::convert::TryFrom; use std::fmt::Display; use std::sync::Arc; -use ton_block::{Message, MsgAddressExt, Serializable}; -use ton_types::{BuilderData, IBitstring, SliceData}; +use ever_block::{Message, MsgAddressExt, Serializable}; +use ever_block::{BuilderData, IBitstring, SliceData}; const SUPPORTED_ABI_VERSION: u8 = 2; const ABI_2_3: u8 = 0x32; @@ -100,7 +100,7 @@ pub fn prepare_ext_in_message( msg: &Message, now_ms: u64, keypair: Option, -) -> Result<(u32, u32, u32, ton_block::MsgAddressInt, Message), String> { +) -> Result<(u32, u32, u32, ever_block::MsgAddressInt, Message), String> { let config = crate::ClientConfig::default(); let ton_client = Arc::new(crate::ClientContext::new(config).unwrap()); @@ -115,7 +115,7 @@ pub fn prepare_ext_in_message( }; let hdr = msg.ext_in_header().unwrap(); - let dst_addr: ton_block::MsgAddressInt = hdr.dst.clone(); + let dst_addr: ever_block::MsgAddressInt = hdr.dst.clone(); let meta = Metadata::try_from(hdr.src.clone()).unwrap(); let future = decode_and_fix_ext_msg(msg, now_ms, &signer, true, &meta, &ton_client); diff --git a/ton_client/src/debot/dengine.rs b/ton_client/src/debot/dengine.rs index 23339c4b2..51cb9cc53 100644 --- a/ton_client/src/debot/dengine.rs +++ b/ton_client/src/debot/dengine.rs @@ -28,7 +28,7 @@ use crate::tvm::{run_tvm, ParamsOfRunTvm}; use crate::{ClientConfig, ClientContext}; use std::collections::VecDeque; use std::sync::Arc; -use ton_abi::Contract; +use ever_abi::Contract; const EMPTY_CELL: &'static str = "te6ccgEBAQEAAgAAAA=="; diff --git a/ton_client/src/debot/dinterface.rs b/ton_client/src/debot/dinterface.rs index b5f0083ba..5a02e6c7c 100644 --- a/ton_client/src/debot/dinterface.rs +++ b/ton_client/src/debot/dinterface.rs @@ -14,11 +14,11 @@ use serde_json::Value; use std::collections::HashMap; use std::sync::Arc; pub type InterfaceResult = Result<(u32, Value), String>; -use ton_abi::{Contract, ParamType}; +use ever_abi::{Contract, ParamType}; use crate::boc::internal::deserialize_cell_from_boc; use ton_sdk::AbiContract; -use ton_abi::token::Detokenizer; +use ever_abi::token::Detokenizer; fn decode_msg( client: TonClient, diff --git a/ton_client/src/debot/helpers.rs b/ton_client/src/debot/helpers.rs index 64eacb50d..d3c399b52 100644 --- a/ton_client/src/debot/helpers.rs +++ b/ton_client/src/debot/helpers.rs @@ -1,8 +1,8 @@ use crate::boc::internal::serialize_object_to_base64; use crate::encoding::account_decode; use crate::error::ClientResult; -use ton_block::{InternalMessageHeader, Message}; -use ton_types::SliceData; +use ever_block::{InternalMessageHeader, Message}; +use ever_block::SliceData; pub(super) fn build_internal_message( src: &String, diff --git a/ton_client/src/debot/json_interface.rs b/ton_client/src/debot/json_interface.rs index f08f88625..4a2d7c36c 100644 --- a/ton_client/src/debot/json_interface.rs +++ b/ton_client/src/debot/json_interface.rs @@ -3,7 +3,7 @@ use super::json_lib_utils::bypass_json; use crate::abi::Abi; use crate::debot::json_lib_utils::pack; use serde_json::Value as JsonValue; -use ton_abi::{Contract, ParamType}; +use ever_abi::{Contract, ParamType}; const ABI: &str = r#" { diff --git a/ton_client/src/debot/json_lib_utils.rs b/ton_client/src/debot/json_lib_utils.rs index 5b8d19254..539f98382 100644 --- a/ton_client/src/debot/json_lib_utils.rs +++ b/ton_client/src/debot/json_lib_utils.rs @@ -2,7 +2,7 @@ use crate::boc::internal::{deserialize_cell_from_base64, serialize_cell_to_base6 use serde_json::Value as JsonValue; use sha2::Digest; use std::collections::HashMap; -use ton_abi::{contract::ABI_VERSION_2_0, token::Tokenizer, Param, ParamType, TokenValue}; +use ever_abi::{contract::ABI_VERSION_2_0, token::Tokenizer, Param, ParamType, TokenValue}; use serde_repr::{Deserialize_repr, Serialize_repr}; #[derive(Serialize_repr, Deserialize_repr)] diff --git a/ton_client/src/debot/msg_interface.rs b/ton_client/src/debot/msg_interface.rs index 9fa5e435d..00f981a82 100644 --- a/ton_client/src/debot/msg_interface.rs +++ b/ton_client/src/debot/msg_interface.rs @@ -7,7 +7,7 @@ use crate::debot::TonClient; use crate::encoding::decode_abi_bigint; use serde_json::Value; use std::sync::Arc; -use ton_abi::Contract; +use ever_abi::Contract; use crate::abi::Signer; use crate::boc::{parse_message, ParamsOfParse}; use crate::debot::DEngine; diff --git a/ton_client/src/debot/run_output.rs b/ton_client/src/debot/run_output.rs index 505248bde..279e42d35 100644 --- a/ton_client/src/debot/run_output.rs +++ b/ton_client/src/debot/run_output.rs @@ -5,7 +5,7 @@ use crate::boc::internal::{deserialize_object_from_base64, serialize_object_to_b use crate::encoding::account_decode; use crate::error::ClientError; use std::collections::VecDeque; -use ton_block::{Message, MsgAddressInt}; +use ever_block::{Message, MsgAddressInt}; #[derive(Default)] pub(super) struct RunOutput { diff --git a/ton_client/src/encoding.rs b/ton_client/src/encoding.rs index c25297c39..e64f5a4f9 100644 --- a/ton_client/src/encoding.rs +++ b/ton_client/src/encoding.rs @@ -19,8 +19,8 @@ use crate::error::ClientResult; use std::str::FromStr; use num_bigint::BigInt; use num_traits::cast::NumCast; -use ton_block::MsgAddressInt; -use ton_types::{Cell, SliceData}; +use ever_block::MsgAddressInt; +use ever_block::{Cell, SliceData}; //------------------------------------------------------------------------------------------------------ diff --git a/ton_client/src/error.rs b/ton_client/src/error.rs index 46a65109d..a83d7bbf5 100644 --- a/ton_client/src/error.rs +++ b/ton_client/src/error.rs @@ -152,7 +152,7 @@ impl ClientError { self } - pub fn add_address(mut self, address: &ton_block::MsgAddressInt) -> ClientError { + pub fn add_address(mut self, address: &ever_block::MsgAddressInt) -> ClientError { self.data["account_address"] = address.to_string().into(); self } diff --git a/ton_client/src/json_interface/interop.rs b/ton_client/src/json_interface/interop.rs index 73235c23d..db5a9dff5 100644 --- a/ton_client/src/json_interface/interop.rs +++ b/ton_client/src/json_interface/interop.rs @@ -27,7 +27,7 @@ pub type ContextHandle = u32; /// Response types, handled by the response handlers of the library. /// -/// See the full description here https://github.com/tonlabs/ever-sdk/blob/master/docs/for-binding-developers/json_interface.md#responses +/// See the full description here https://github.com/everx-labs/ever-sdk/blob/master/docs/for-binding-developers/json_interface.md#responses /// In case of `subscribe` and `subscribe_collection` functions /// there are only 2 types of ResponseType: 100 - OK, 101 - Error pub enum ResponseType { diff --git a/ton_client/src/net/iterators/block.rs b/ton_client/src/net/iterators/block.rs index 35ef9fd44..dd9f2e0de 100644 --- a/ton_client/src/net/iterators/block.rs +++ b/ton_client/src/net/iterators/block.rs @@ -22,7 +22,7 @@ use crate::error::ClientResult; use crate::net::{query_collection, OrderBy, ParamsOfQueryCollection, SortDirection}; use crate::ClientContext; use serde::Serializer; -use ton_block::ShardIdent; +use ever_block::ShardIdent; pub const BLOCK_TRAVERSE_FIELDS: &str = r#" id diff --git a/ton_client/src/net/iterators/block_iterator/branch.rs b/ton_client/src/net/iterators/block_iterator/branch.rs index 011c962d2..9036294e5 100644 --- a/ton_client/src/net/iterators/block_iterator/branch.rs +++ b/ton_client/src/net/iterators/block_iterator/branch.rs @@ -14,7 +14,7 @@ use std::sync::Arc; -use ton_block::ShardIdent; +use ever_block::ShardIdent; use crate::error::ClientResult; use crate::net::iterators::block::BlockFields; diff --git a/ton_client/src/net/iterators/block_iterator/filter.rs b/ton_client/src/net/iterators/block_iterator/filter.rs index 0e819d6a6..e559dff63 100644 --- a/ton_client/src/net/iterators/block_iterator/filter.rs +++ b/ton_client/src/net/iterators/block_iterator/filter.rs @@ -12,7 +12,7 @@ * */ -use ton_block::ShardIdent; +use ever_block::ShardIdent; use crate::error::ClientResult; use crate::net::iterators::block::{shard_ident_parse, BlockFields}; diff --git a/ton_client/src/net/iterators/block_iterator/mod.rs b/ton_client/src/net/iterators/block_iterator/mod.rs index 772137466..66343ffa1 100644 --- a/ton_client/src/net/iterators/block_iterator/mod.rs +++ b/ton_client/src/net/iterators/block_iterator/mod.rs @@ -31,7 +31,7 @@ use crate::net::iterators::block::{ use crate::net::iterators::block_iterator::state::StateBuilder; use crate::net::iterators::{query_by_ids, register_iterator, ResultOfIteratorNext}; use crate::net::{query_collection, ChainIterator, ParamsOfQueryCollection, RegisteredIterator}; -use ton_block::ShardIdent; +use ever_block::ShardIdent; mod branch; mod filter; diff --git a/ton_client/src/net/network.rs b/ton_client/src/net/network.rs index 74a850117..f8243e8d6 100644 --- a/ton_client/src/net/network.rs +++ b/ton_client/src/net/network.rs @@ -16,7 +16,7 @@ use std::future::Future; use std::str::FromStr; use std::sync::Arc; use tokio::sync::{mpsc, Mutex, RwLock}; -use ton_types::UInt256; +use ever_block::UInt256; use crate::utils::json::JsonHelper; #[derive(Debug)] @@ -137,7 +137,7 @@ impl NetworkContext { Ok(handle) } - pub(crate) async fn get_current_network_uid(&self) -> ton_types::Result> { + pub(crate) async fn get_current_network_uid(&self) -> ever_block::Result> { if let Some(ref uid) = *self.network_uid.read().await { return Ok(Arc::clone(uid)); } @@ -154,7 +154,7 @@ impl NetworkContext { Ok(queried_uid) } - pub(crate) async fn query_current_network_uid(&self) -> ton_types::Result> { + pub(crate) async fn query_current_network_uid(&self) -> ever_block::Result> { let blocks = self .query_collection(ParamsOfQueryCollection { collection: "blocks".to_string(), diff --git a/ton_client/src/net/network_params.rs b/ton_client/src/net/network_params.rs index da6e7a985..50351d0bb 100644 --- a/ton_client/src/net/network_params.rs +++ b/ton_client/src/net/network_params.rs @@ -22,8 +22,8 @@ use crate::{ net::{OrderBy, ParamsOfQueryCollection, ServerLink, SortDirection}, }; use std::sync::Arc; -use ton_block::{Deserializable, GlobalCapabilities}; -use ton_executor::BlockchainConfig; +use ever_block::{Deserializable, GlobalCapabilities}; +use ever_executor::BlockchainConfig; #[derive(Serialize, Deserialize, ApiType, Default, Clone)] pub struct ResultOfGetSignatureId { @@ -46,7 +46,7 @@ pub(crate) fn offline_config() -> (BlockchainConfig, i32) { let bytes = include_bytes!("../default_config.boc"); ( BlockchainConfig::with_config( - ton_block::ConfigParams::construct_from_bytes(bytes).unwrap() + ever_block::ConfigParams::construct_from_bytes(bytes).unwrap() ).unwrap(), 42 ) diff --git a/ton_client/src/net/server_link.rs b/ton_client/src/net/server_link.rs index eb2f59975..1546f7dcc 100644 --- a/ton_client/src/net/server_link.rs +++ b/ton_client/src/net/server_link.rs @@ -30,7 +30,7 @@ use std::pin::Pin; use std::sync::atomic::{AtomicBool, AtomicU32, Ordering}; use std::sync::Arc; use tokio::sync::{watch, Mutex, RwLock}; -use ton_types::UInt256; +use ever_block::UInt256; use super::ErrorCode; diff --git a/ton_client/src/net/tests.rs b/ton_client/src/net/tests.rs index 56626eaaf..4cfe7ed3c 100644 --- a/ton_client/src/net/tests.rs +++ b/ton_client/src/net/tests.rs @@ -527,7 +527,7 @@ async fn subscribe_for_transactions_with_addresses() { collection: "transactions".to_owned(), filter: Some(json!({ "account_addr": { "eq": msg.address.clone() }, - "status": { "eq": ton_sdk::json_helper::transaction_status_to_u8(ton_block::TransactionProcessingStatus::Finalized) } + "status": { "eq": ton_sdk::json_helper::transaction_status_to_u8(ever_block::TransactionProcessingStatus::Finalized) } })), result: "id account_addr status".to_owned(), }, @@ -586,7 +586,7 @@ async fn subscribe_for_transactions_with_addresses() { collection: "transactions".to_owned(), filter: Some(json!({ "account_addr": { "eq": msg.address.clone() }, - "status": { "eq": ton_sdk::json_helper::transaction_status_to_u8(ton_block::TransactionProcessingStatus::Finalized) } + "status": { "eq": ton_sdk::json_helper::transaction_status_to_u8(ever_block::TransactionProcessingStatus::Finalized) } })), result: "id account_addr status".to_owned(), }, @@ -752,7 +752,7 @@ async fn find_last_shard_block() { // async fn test_endpoints() { // let client = TestClient::new_with_config(json!({ // "network": { -// "endpoints": ["cinet.tonlabs.io", "cinet2.tonlabs.io/"], +// "endpoints": ["cinet.everx.dev", "cinet2.everx.dev/"], // } // })); diff --git a/ton_client/src/processing/blocks_walking.rs b/ton_client/src/processing/blocks_walking.rs index a7f2d52cc..59bf0f76d 100644 --- a/ton_client/src/processing/blocks_walking.rs +++ b/ton_client/src/processing/blocks_walking.rs @@ -16,8 +16,8 @@ use crate::client::ClientContext; use crate::error::ClientResult; use crate::net::{OrderBy, ParamsOfQueryCollection, ParamsOfWaitForCollection, SortDirection, BLOCKS_COLLECTION, Endpoint}; use std::sync::Arc; -use ton_block::MsgAddressInt; -use ton_block::MASTERCHAIN_ID; +use ever_block::MsgAddressInt; +use ever_block::MASTERCHAIN_ID; pub const BLOCK_FIELDS: &str = r#" id diff --git a/ton_client/src/processing/errors.rs b/ton_client/src/processing/errors.rs index ac4358e0f..908805f0c 100644 --- a/ton_client/src/processing/errors.rs +++ b/ton_client/src/processing/errors.rs @@ -14,7 +14,7 @@ use crate::error::{ClientError, format_time}; use serde_json::Value; -use ton_block::MsgAddressInt; +use ever_block::MsgAddressInt; #[derive(ApiType)] pub enum ErrorCode { diff --git a/ton_client/src/processing/fetching.rs b/ton_client/src/processing/fetching.rs index fa653e384..2ba947296 100644 --- a/ton_client/src/processing/fetching.rs +++ b/ton_client/src/processing/fetching.rs @@ -15,7 +15,7 @@ use crate::tvm::check_transaction::{calc_transaction_fees, extract_error}; use serde_json::Value; use std::convert::TryFrom; use std::sync::Arc; -use ton_block::MsgAddressInt; +use ever_block::MsgAddressInt; use ton_sdk::Block; pub async fn fetch_next_shard_block + Send>( diff --git a/ton_client/src/processing/internal.rs b/ton_client/src/processing/internal.rs index 71fd0f493..0a659d94d 100644 --- a/ton_client/src/processing/internal.rs +++ b/ton_client/src/processing/internal.rs @@ -6,7 +6,7 @@ use crate::error::{ClientError, ClientResult}; use crate::processing::Error; use crate::tvm::{AccountForExecutor, ExecutionOptions, ParamsOfRunExecutor}; use std::sync::Arc; -use ton_block::MsgAddressInt; +use ever_block::MsgAddressInt; use ton_sdk::{Block, MessageId}; const ACCOUNT_NONEXIST: u8 = 3; diff --git a/ton_client/src/processing/message_monitor_sdk_services.rs b/ton_client/src/processing/message_monitor_sdk_services.rs index 5304ab60a..18d3b037e 100644 --- a/ton_client/src/processing/message_monitor_sdk_services.rs +++ b/ton_client/src/processing/message_monitor_sdk_services.rs @@ -11,7 +11,7 @@ use ton_client_processing::{ MessageMonitoringStatus, MessageMonitoringTransaction, MessageMonitoringTransactionCompute, MonitoredMessage, NetSubscription, }; -use ton_types::Cell; +use ever_block::Cell; pub(crate) struct SdkServices { net: Arc, diff --git a/ton_client/src/processing/send_message.rs b/ton_client/src/processing/send_message.rs index a8c1e5e33..2db49075e 100644 --- a/ton_client/src/processing/send_message.rs +++ b/ton_client/src/processing/send_message.rs @@ -23,7 +23,7 @@ use crate::processing::internal::get_message_expiration_time; use crate::processing::types::ProcessingEvent; use crate::processing::Error; use std::sync::Arc; -use ton_block::{Message, MsgAddressInt}; +use ever_block::{Message, MsgAddressInt}; #[derive(Serialize, Deserialize, ApiType, Default, Debug, Clone)] pub struct ParamsOfSendMessage { diff --git a/ton_client/src/processing/tests.rs b/ton_client/src/processing/tests.rs index d88e974d7..c748cd04d 100644 --- a/ton_client/src/processing/tests.rs +++ b/ton_client/src/processing/tests.rs @@ -18,7 +18,7 @@ use crate::tvm::{AccountForExecutor, ParamsOfRunExecutor, ResultOfRunExecutor}; use crate::utils::conversion::abi_uint; use api_info::ApiModule; use ever_struct::scheme::TVC; -use ton_block::{Serializable, StateInit}; +use ever_block::{Serializable, StateInit}; fn processing_event_name(e: Option<&ProcessingEvent>) -> &str { if let Some(e) = e { @@ -47,6 +47,7 @@ fn processing_event_name(e: Option<&ProcessingEvent>) -> &str { fn assert_events(events: &[ProcessingEvent], remp_enabled: bool) { let expected = if remp_enabled { return; +/* &[ "WillFetchFirstBlock", "WillSend", @@ -59,6 +60,7 @@ fn assert_events(events: &[ProcessingEvent], remp_enabled: bool) { "RempIncludedIntoAcceptedBlock*", "RempOther*", ][..] +*/ } else { &[ "WillFetchFirstBlock", diff --git a/ton_client/src/processing/wait_for_transaction.rs b/ton_client/src/processing/wait_for_transaction.rs index b6d829de1..d48bb648d 100644 --- a/ton_client/src/processing/wait_for_transaction.rs +++ b/ton_client/src/processing/wait_for_transaction.rs @@ -11,7 +11,7 @@ use futures::{FutureExt, StreamExt}; use std::convert::TryInto; use std::sync::Arc; use tokio::sync::mpsc; -use ton_block::{Message, MsgAddressInt}; +use ever_block::{Message, MsgAddressInt}; //--------------------------------------------------------------------------- wait_for_transaction diff --git a/ton_client/src/proofs/engine.rs b/ton_client/src/proofs/engine.rs index 31e96196d..4048f1927 100644 --- a/ton_client/src/proofs/engine.rs +++ b/ton_client/src/proofs/engine.rs @@ -6,8 +6,8 @@ use std::sync::Arc; use failure::{bail, err_msg}; use serde_json::Value; -use ton_block::{BinTreeType, Block, Deserializable, InRefValue, ShardIdent, ShardStateUnsplit}; -use ton_types::{Result, UInt256}; +use ever_block::{BinTreeType, Block, Deserializable, InRefValue, ShardIdent, ShardStateUnsplit}; +use ever_block::{Result, UInt256}; use crate::boc::internal::get_boc_hash; use crate::client::storage::{InMemoryKeyValueStorage, KeyValueStorage}; @@ -724,7 +724,7 @@ impl ProofHelperEngineImpl { } pub async fn check_shard_block(&self, boc: &[u8]) -> Result<()> { - let cell = ton_types::boc::read_single_root_boc(&boc)?; + let cell = ever_block::boc::read_single_root_boc(&boc)?; let root_hash = cell.repr_hash(); let block = Block::construct_from_cell(cell)?; @@ -748,7 +748,7 @@ impl ProofHelperEngineImpl { let mc_boc = self.download_block_boc( &mc_proof.id().root_hash().as_hex_string(), ).await?; - let mc_cell = ton_types::boc::read_single_root_boc(&mc_boc)?; + let mc_cell = ever_block::boc::read_single_root_boc(&mc_boc)?; if mc_cell.repr_hash() != *mc_proof.id().root_hash() { bail!( @@ -808,7 +808,7 @@ impl ProofHelperEngineImpl { let mut last_prev_ref_seq_no = top_seq_no; let mut last_prev_ref_root_hash = top_root_hash; for boc in shard_chain.iter().rev() { - let cell = ton_types::boc::read_single_root_boc(&boc)?; + let cell = ever_block::boc::read_single_root_boc(&boc)?; let root_hash = cell.repr_hash(); let block = Block::construct_from_cell(cell)?; let info = block.read_info()?; diff --git a/ton_client/src/proofs/json.rs b/ton_client/src/proofs/json.rs index aea7d2f02..017e3d310 100644 --- a/ton_client/src/proofs/json.rs +++ b/ton_client/src/proofs/json.rs @@ -6,9 +6,9 @@ use std::time::Duration; use chrono::{DateTime, Utc}; use serde_json::{Map, Value}; -use ton_block::{Block, Message, Transaction}; -use ton_block_json::{BlockSerializationSet, MessageSerializationSet, TransactionSerializationSet}; -use ton_types::{Result, UInt256}; +use ever_block::{Block, Message, Transaction}; +use ever_block_json::{BlockSerializationSet, MessageSerializationSet, TransactionSerializationSet}; +use ever_block::{Result, UInt256}; use crate::error::ClientResult; use crate::proofs::errors::Error; @@ -422,15 +422,15 @@ pub(crate) fn serialize_block( block: Block, boc: Vec, ) -> Result { - let mut value = ton_block_json::db_serialize_block_ex( + let mut value = ever_block_json::db_serialize_block_ex( "id", &BlockSerializationSet { block, id, - status: ton_block::BlockProcessingStatus::Finalized, + status: ever_block::BlockProcessingStatus::Finalized, boc }, - ton_block_json::SerializationMode::QServer, + ever_block_json::SerializationMode::QServer, )?.into(); add_time_strings( @@ -449,18 +449,18 @@ pub(crate) fn serialize_transaction( workchain_id: i32, boc: Vec, ) -> Result { - let mut value = ton_block_json::db_serialize_transaction_ex( + let mut value = ever_block_json::db_serialize_transaction_ex( "id", &TransactionSerializationSet { transaction, id, - status: ton_block::TransactionProcessingStatus::Finalized, + status: ever_block::TransactionProcessingStatus::Finalized, block_id: Some(block_id), workchain_id, boc, proof: None, }, - ton_block_json::SerializationMode::QServer, + ever_block_json::SerializationMode::QServer, )?.into(); add_time_strings( @@ -487,7 +487,7 @@ pub(crate) fn serialize_message( message: Message, boc: Vec, ) -> Result { - let mut value = ton_block_json::db_serialize_message_ex( + let mut value = ever_block_json::db_serialize_message_ex( "id", &MessageSerializationSet { message, @@ -495,11 +495,11 @@ pub(crate) fn serialize_message( block_id: None, transaction_id: None, transaction_now: None, - status: ton_block::MessageProcessingStatus::Finalized, + status: ever_block::MessageProcessingStatus::Finalized, boc, proof: None, }, - ton_block_json::SerializationMode::QServer, + ever_block_json::SerializationMode::QServer, )?.into(); add_time_strings( diff --git a/ton_client/src/proofs/mod.rs b/ton_client/src/proofs/mod.rs index 118ef9ca6..6061f96b3 100644 --- a/ton_client/src/proofs/mod.rs +++ b/ton_client/src/proofs/mod.rs @@ -6,13 +6,13 @@ use std::sync::Arc; use failure::{bail, err_msg}; use serde::{Deserialize, Deserializer}; use serde_json::Value; -use ton_block::{ +use ever_block::{ Block, BlockIdExt, BlockInfo, CryptoSignature, CryptoSignaturePair, Deserializable, HashmapAugType, MerkleProof, Message, ShardIdent, ShardStateUnsplit, Transaction, ValidatorDescr, }; -use ton_types::{Cell, UInt256, SliceData}; -use ton_types::Result; +use ever_block::{Cell, UInt256, SliceData}; +use ever_block::Result; pub(crate) use errors::ErrorCode; @@ -524,7 +524,7 @@ impl BlockProof { let signatures_json = &value["signatures"]; let root_boc = base64::decode(signatures_json.get_str("proof")?)?; - let root = ton_types::boc::read_single_root_boc(&root_boc)?; + let root = ever_block::boc::read_single_root_boc(&root_boc)?; let mut pure_signatures = Vec::new(); let signatures_json_vec = signatures_json.get_array("signatures")?; @@ -553,12 +553,12 @@ impl BlockProof { } pub fn deserialize(data: &[u8]) -> Result { - let proof = ton_block::BlockProof::construct_from_bytes(data)?; + let proof = ever_block::BlockProof::construct_from_bytes(data)?; let signatures = proof.signatures .ok_or_else(|| err_msg("Signatures must be filled"))?; let mut pure_signatures = Vec::new(); - ton_types::HashmapType::iterate_slices(signatures.pure_signatures.signatures(), + ever_block::HashmapType::iterate_slices(signatures.pure_signatures.signatures(), |ref mut _key, ref mut slice| { pure_signatures.push(CryptoSignaturePair::construct_from(slice)?); Ok(true) diff --git a/ton_client/src/proofs/tests/mod.rs b/ton_client/src/proofs/tests/mod.rs index fd9669ecc..1852435c5 100644 --- a/ton_client/src/proofs/tests/mod.rs +++ b/ton_client/src/proofs/tests/mod.rs @@ -5,11 +5,11 @@ use std::sync::Arc; use failure::bail; use graphql_parser::schema::{Definition, ObjectType, Type, TypeDefinition}; use serde_json::Value; -use ton_block::{ +use ever_block::{ BinTreeType, Block, BlockIdExt, Deserializable, InRefValue, ShardHashes, ShardIdent, ShardStateUnsplit, MASTERCHAIN_ID, }; -use ton_types::{Result, UInt256}; +use ever_block::{Result, UInt256}; use crate::client::storage::InMemoryKeyValueStorage; use crate::net::{query_collection, ParamsOfQueryCollection}; @@ -111,7 +111,7 @@ fn test_validator_set() -> Result<()> { &vset, config, &cc_config, - ton_block::SHARD_FULL, + ever_block::SHARD_FULL, workchain_id, cc_seqno, 0.into(), diff --git a/ton_client/src/proofs/validators.rs b/ton_client/src/proofs/validators.rs index 208d07ce3..a7f308e7c 100644 --- a/ton_client/src/proofs/validators.rs +++ b/ton_client/src/proofs/validators.rs @@ -5,11 +5,11 @@ use std::fmt::{Display, Formatter}; // use ed25519_dalek::Digest; use failure::bail; use sha2::Digest; -use ton_block::{ +use ever_block::{ CatchainConfig, ConfigParams, UnixTime32, ValidatorDescr, ValidatorSet, WorkchainDescr, Workchains, }; -use ton_types::Result; +use ever_block::Result; use crate::proofs::Signatures; diff --git a/ton_client/src/tests/contracts/abi_v2/testDebot10.sol b/ton_client/src/tests/contracts/abi_v2/testDebot10.sol index de615c1cb..64ee3e08c 100644 --- a/ton_client/src/tests/contracts/abi_v2/testDebot10.sol +++ b/ton_client/src/tests/contracts/abi_v2/testDebot10.sol @@ -2,8 +2,8 @@ pragma ton-solidity >=0.45.0; pragma AbiHeader expire; pragma AbiHeader time; pragma AbiHeader pubkey; -import "https://raw.githubusercontent.com/tonlabs/debots/main/Debot.sol"; -import "https://raw.githubusercontent.com/tonlabs/DeBot-IS-consortium/main/Terminal/Terminal.sol"; +import "https://raw.githubusercontent.com/everx-labs/debots/main/Debot.sol"; +import "https://raw.githubusercontent.com/everx-labs/DeBot-IS-consortium/main/Terminal/Terminal.sol"; import "../EncryptionBoxInput.sol"; import "../Sdk.sol"; diff --git a/ton_client/src/tests/contracts/abi_v2/testDebot11.sol b/ton_client/src/tests/contracts/abi_v2/testDebot11.sol index 413780dc4..fdb337000 100644 --- a/ton_client/src/tests/contracts/abi_v2/testDebot11.sol +++ b/ton_client/src/tests/contracts/abi_v2/testDebot11.sol @@ -2,12 +2,12 @@ pragma ton-solidity >=0.45.0; pragma AbiHeader expire; pragma AbiHeader time; pragma AbiHeader pubkey; -import "https://raw.githubusercontent.com/tonlabs/debots/main/Debot.sol"; -import "https://raw.githubusercontent.com/tonlabs/DeBot-IS-consortium/main/Terminal/Terminal.sol"; -import "https://raw.githubusercontent.com/tonlabs/DeBot-IS-consortium/main/JsonDeserialize/Json.sol"; -import "https://raw.githubusercontent.com/tonlabs/DeBot-IS-consortium/main/Hex/Hex.sol"; -import "https://raw.githubusercontent.com/tonlabs/DeBot-IS-consortium/main/EncryptionBoxInput/EncryptionBoxInput.sol"; -import "https://raw.githubusercontent.com/tonlabs/DeBot-IS-consortium/main/Sdk/Sdk.sol"; +import "https://raw.githubusercontent.com/everx-labs/debots/main/Debot.sol"; +import "https://raw.githubusercontent.com/everx-labs/DeBot-IS-consortium/main/Terminal/Terminal.sol"; +import "https://raw.githubusercontent.com/everx-labs/DeBot-IS-consortium/main/JsonDeserialize/Json.sol"; +import "https://raw.githubusercontent.com/everx-labs/DeBot-IS-consortium/main/Hex/Hex.sol"; +import "https://raw.githubusercontent.com/everx-labs/DeBot-IS-consortium/main/EncryptionBoxInput/EncryptionBoxInput.sol"; +import "https://raw.githubusercontent.com/everx-labs/DeBot-IS-consortium/main/Sdk/Sdk.sol"; contract ExampleContract is Debot { diff --git a/ton_client/src/tests/contracts/abi_v2/testDebot12.sol b/ton_client/src/tests/contracts/abi_v2/testDebot12.sol index 0293bff1c..c1f9d6fba 100644 --- a/ton_client/src/tests/contracts/abi_v2/testDebot12.sol +++ b/ton_client/src/tests/contracts/abi_v2/testDebot12.sol @@ -2,10 +2,10 @@ pragma ton-solidity >=0.47.0; pragma AbiHeader expire; pragma AbiHeader time; pragma AbiHeader pubkey; -import "https://raw.githubusercontent.com/tonlabs/debots/main/Debot.sol"; -import "https://raw.githubusercontent.com/tonlabs/DeBot-IS-consortium/main/Terminal/Terminal.sol"; -import "https://raw.githubusercontent.com/tonlabs/DeBot-IS-consortium/main/SigningBoxInput/SigningBoxInput.sol"; -import "https://raw.githubusercontent.com/tonlabs/DeBot-IS-consortium/main/Sdk/Sdk.sol"; +import "https://raw.githubusercontent.com/everx-labs/debots/main/Debot.sol"; +import "https://raw.githubusercontent.com/everx-labs/DeBot-IS-consortium/main/Terminal/Terminal.sol"; +import "https://raw.githubusercontent.com/everx-labs/DeBot-IS-consortium/main/SigningBoxInput/SigningBoxInput.sol"; +import "https://raw.githubusercontent.com/everx-labs/DeBot-IS-consortium/main/Sdk/Sdk.sol"; contract testDebot is Debot { diff --git a/ton_client/src/tests/contracts/abi_v2/testDebot14.sol b/ton_client/src/tests/contracts/abi_v2/testDebot14.sol index 9204f13f2..a9881b5da 100644 --- a/ton_client/src/tests/contracts/abi_v2/testDebot14.sol +++ b/ton_client/src/tests/contracts/abi_v2/testDebot14.sol @@ -2,11 +2,11 @@ pragma ton-solidity >=0.47.0; pragma AbiHeader expire; pragma AbiHeader time; pragma AbiHeader pubkey; -import "https://raw.githubusercontent.com/tonlabs/debots/main/Debot.sol"; -import "https://raw.githubusercontent.com/tonlabs/DeBot-IS-consortium/main/Terminal/Terminal.sol"; -import "https://raw.githubusercontent.com/tonlabs/DeBot-IS-consortium/main/SigningBoxInput/SigningBoxInput.sol"; -import "https://raw.githubusercontent.com/tonlabs/DeBot-IS-consortium/main/libraries/JsonLib.sol"; -import "https://raw.githubusercontent.com/tonlabs/DeBot-IS-consortium/main/Query/Query.sol"; +import "https://raw.githubusercontent.com/everx-labs/debots/main/Debot.sol"; +import "https://raw.githubusercontent.com/everx-labs/DeBot-IS-consortium/main/Terminal/Terminal.sol"; +import "https://raw.githubusercontent.com/everx-labs/DeBot-IS-consortium/main/SigningBoxInput/SigningBoxInput.sol"; +import "https://raw.githubusercontent.com/everx-labs/DeBot-IS-consortium/main/libraries/JsonLib.sol"; +import "https://raw.githubusercontent.com/everx-labs/DeBot-IS-consortium/main/Query/Query.sol"; contract TestDebot14 is Debot { diff --git a/ton_client/src/tests/contracts/abi_v2/testDebot15.sol b/ton_client/src/tests/contracts/abi_v2/testDebot15.sol index a9224c7b1..46e062bc9 100644 --- a/ton_client/src/tests/contracts/abi_v2/testDebot15.sol +++ b/ton_client/src/tests/contracts/abi_v2/testDebot15.sol @@ -2,9 +2,9 @@ pragma ton-solidity >=0.47.0; pragma AbiHeader expire; pragma AbiHeader time; pragma AbiHeader pubkey; -import "https://raw.githubusercontent.com/tonlabs/debots/main/Debot.sol"; -import "https://raw.githubusercontent.com/tonlabs/DeBot-IS-consortium/main/Terminal/Terminal.sol"; -import "https://raw.githubusercontent.com/tonlabs/DeBot-IS-consortium/main/Json/Json.sol"; +import "https://raw.githubusercontent.com/everx-labs/debots/main/Debot.sol"; +import "https://raw.githubusercontent.com/everx-labs/DeBot-IS-consortium/main/Terminal/Terminal.sol"; +import "https://raw.githubusercontent.com/everx-labs/DeBot-IS-consortium/main/Json/Json.sol"; contract TestDebot15 is Debot { diff --git a/ton_client/src/tests/contracts/abi_v2/testDebot16.sol b/ton_client/src/tests/contracts/abi_v2/testDebot16.sol index 7f5d1388e..0d8bb1459 100644 --- a/ton_client/src/tests/contracts/abi_v2/testDebot16.sol +++ b/ton_client/src/tests/contracts/abi_v2/testDebot16.sol @@ -2,8 +2,8 @@ pragma ton-solidity >=0.51.0; pragma AbiHeader expire; pragma AbiHeader time; pragma AbiHeader pubkey; -import "https://raw.githubusercontent.com/tonlabs/debots/main/Debot.sol"; -import "https://raw.githubusercontent.com/tonlabs/DeBot-IS-consortium/main/Base64/Base64.sol"; +import "https://raw.githubusercontent.com/everx-labs/debots/main/Debot.sol"; +import "https://raw.githubusercontent.com/everx-labs/DeBot-IS-consortium/main/Base64/Base64.sol"; contract TestDebot16 is Debot { diff --git a/ton_client/src/tests/contracts/abi_v2/testDebot17.sol b/ton_client/src/tests/contracts/abi_v2/testDebot17.sol index 8bab792d8..50a22ee16 100644 --- a/ton_client/src/tests/contracts/abi_v2/testDebot17.sol +++ b/ton_client/src/tests/contracts/abi_v2/testDebot17.sol @@ -2,8 +2,8 @@ pragma ton-solidity >=0.40.0; pragma AbiHeader expire; pragma AbiHeader time; pragma AbiHeader pubkey; -import "https://raw.githubusercontent.com/tonlabs/debots/main/Debot.sol"; -import "https://raw.githubusercontent.com/tonlabs/DeBot-IS-consortium/main/Query/Query.sol"; +import "https://raw.githubusercontent.com/everx-labs/debots/main/Debot.sol"; +import "https://raw.githubusercontent.com/everx-labs/DeBot-IS-consortium/main/Query/Query.sol"; interface IMsg { diff --git a/ton_client/src/tests/contracts/abi_v2/testDebot18.sol b/ton_client/src/tests/contracts/abi_v2/testDebot18.sol index aa349ea54..f0965ba21 100644 --- a/ton_client/src/tests/contracts/abi_v2/testDebot18.sol +++ b/ton_client/src/tests/contracts/abi_v2/testDebot18.sol @@ -2,8 +2,8 @@ pragma ton-solidity >=0.40.0; pragma AbiHeader expire; pragma AbiHeader time; pragma AbiHeader pubkey; -import "https://raw.githubusercontent.com/tonlabs/debots/main/Debot.sol"; -import "https://raw.githubusercontent.com/tonlabs/DeBot-IS-consortium/main/Query/Query.sol"; +import "https://raw.githubusercontent.com/everx-labs/debots/main/Debot.sol"; +import "https://raw.githubusercontent.com/everx-labs/DeBot-IS-consortium/main/Query/Query.sol"; contract TestDebot18 is Debot { diff --git a/ton_client/src/tests/contracts/abi_v2/testDebot19.sol b/ton_client/src/tests/contracts/abi_v2/testDebot19.sol index ef9a2c67c..6e26eb5fc 100644 --- a/ton_client/src/tests/contracts/abi_v2/testDebot19.sol +++ b/ton_client/src/tests/contracts/abi_v2/testDebot19.sol @@ -2,8 +2,8 @@ pragma ton-solidity >=0.47.0; pragma AbiHeader expire; pragma AbiHeader time; pragma AbiHeader pubkey; -import "https://raw.githubusercontent.com/tonlabs/debots/main/Debot.sol"; -import "https://raw.githubusercontent.com/tonlabs/DeBot-IS-consortium/main/SigningBoxInput/SigningBoxInput.sol"; +import "https://raw.githubusercontent.com/everx-labs/debots/main/Debot.sol"; +import "https://raw.githubusercontent.com/everx-labs/DeBot-IS-consortium/main/SigningBoxInput/SigningBoxInput.sol"; interface IMsg { diff --git a/ton_client/src/tests/contracts/abi_v2/testDebot20.sol b/ton_client/src/tests/contracts/abi_v2/testDebot20.sol index a77e8bcf1..9f2375091 100644 --- a/ton_client/src/tests/contracts/abi_v2/testDebot20.sol +++ b/ton_client/src/tests/contracts/abi_v2/testDebot20.sol @@ -3,11 +3,11 @@ pragma AbiHeader expire; pragma AbiHeader time; pragma AbiHeader pubkey; // import required DeBot interfaces and basic DeBot contract. -import "https://raw.githubusercontent.com/tonlabs/debots/main/Debot.sol"; -import "https://raw.githubusercontent.com/tonlabs/DeBot-IS-consortium/main/SigningBoxInput/SigningBoxInput.sol"; -import "https://raw.githubusercontent.com/tonlabs/DeBot-IS-consortium/main/Terminal/Terminal.sol"; -import "https://raw.githubusercontent.com/tonlabs/DeBot-IS-consortium/main/Query/Query.sol"; -import "https://raw.githubusercontent.com/tonlabs/DeBot-IS-consortium/main/Sdk/Sdk.sol"; +import "https://raw.githubusercontent.com/everx-labs/debots/main/Debot.sol"; +import "https://raw.githubusercontent.com/everx-labs/DeBot-IS-consortium/main/SigningBoxInput/SigningBoxInput.sol"; +import "https://raw.githubusercontent.com/everx-labs/DeBot-IS-consortium/main/Terminal/Terminal.sol"; +import "https://raw.githubusercontent.com/everx-labs/DeBot-IS-consortium/main/Query/Query.sol"; +import "https://raw.githubusercontent.com/everx-labs/DeBot-IS-consortium/main/Sdk/Sdk.sol"; abstract contract ARollingId { function answer(address dst) public {} diff --git a/ton_client/src/tests/contracts/abi_v2/testDebot21.sol b/ton_client/src/tests/contracts/abi_v2/testDebot21.sol index 569d19dce..24eaa0bff 100644 --- a/ton_client/src/tests/contracts/abi_v2/testDebot21.sol +++ b/ton_client/src/tests/contracts/abi_v2/testDebot21.sol @@ -3,10 +3,10 @@ pragma AbiHeader expire; pragma AbiHeader time; pragma AbiHeader pubkey; // import required DeBot interfaces and basic DeBot contract. -import "https://raw.githubusercontent.com/tonlabs/debots/main/Debot.sol"; -import "https://raw.githubusercontent.com/tonlabs/DeBot-IS-consortium/main/Terminal/Terminal.sol"; -import "https://raw.githubusercontent.com/tonlabs/DeBot-IS-consortium/main/SigningBoxInput/SigningBoxInput.sol"; -import "https://raw.githubusercontent.com/tonlabs/DeBot-IS-consortium/main/Sdk/Sdk.sol"; +import "https://raw.githubusercontent.com/everx-labs/debots/main/Debot.sol"; +import "https://raw.githubusercontent.com/everx-labs/DeBot-IS-consortium/main/Terminal/Terminal.sol"; +import "https://raw.githubusercontent.com/everx-labs/DeBot-IS-consortium/main/SigningBoxInput/SigningBoxInput.sol"; +import "https://raw.githubusercontent.com/everx-labs/DeBot-IS-consortium/main/Sdk/Sdk.sol"; contract Test21 is Debot { diff --git a/ton_client/src/tests/contracts/abi_v2/testDebot3.sol b/ton_client/src/tests/contracts/abi_v2/testDebot3.sol index d7ab4a31e..950bcb08f 100644 --- a/ton_client/src/tests/contracts/abi_v2/testDebot3.sol +++ b/ton_client/src/tests/contracts/abi_v2/testDebot3.sol @@ -2,12 +2,12 @@ pragma ton-solidity >=0.40.0; pragma AbiHeader expire; pragma AbiHeader time; pragma AbiHeader pubkey; -import "https://raw.githubusercontent.com/tonlabs/tonos-cli/master/tests/samples/Debot.sol"; -import "https://raw.githubusercontent.com/tonlabs/DeBot-IS-consortium/main/Sdk/Sdk.sol"; -import "https://raw.githubusercontent.com/tonlabs/DeBot-IS-consortium/main/Base64/Base64.sol"; -import "https://raw.githubusercontent.com/tonlabs/DeBot-IS-consortium/main/Hex/Hex.sol"; -import "https://raw.githubusercontent.com/tonlabs/DeBot-IS-consortium/main/Terminal/Terminal.sol"; -import "https://raw.githubusercontent.com/tonlabs/DeBot-IS-consortium/main/SigningBoxInput/SigningBoxInput.sol"; +import "https://raw.githubusercontent.com/everx-labs/tonos-cli/master/tests/samples/Debot.sol"; +import "https://raw.githubusercontent.com/everx-labs/DeBot-IS-consortium/main/Sdk/Sdk.sol"; +import "https://raw.githubusercontent.com/everx-labs/DeBot-IS-consortium/main/Base64/Base64.sol"; +import "https://raw.githubusercontent.com/everx-labs/DeBot-IS-consortium/main/Hex/Hex.sol"; +import "https://raw.githubusercontent.com/everx-labs/DeBot-IS-consortium/main/Terminal/Terminal.sol"; +import "https://raw.githubusercontent.com/everx-labs/DeBot-IS-consortium/main/SigningBoxInput/SigningBoxInput.sol"; // compiled with ton-solidity 0.47.0 diff --git a/ton_client/src/tests/contracts/abi_v2/testDebot6.sol b/ton_client/src/tests/contracts/abi_v2/testDebot6.sol index 5e9081de6..4d429c178 100644 --- a/ton_client/src/tests/contracts/abi_v2/testDebot6.sol +++ b/ton_client/src/tests/contracts/abi_v2/testDebot6.sol @@ -4,8 +4,8 @@ pragma AbiHeader time; pragma AbiHeader pubkey; // import required DeBot interfaces and basic DeBot contract. import "../Debot.sol"; -import "https://raw.githubusercontent.com/tonlabs/DeBot-IS-consortium/main/Terminal/Terminal.sol"; -import "https://raw.githubusercontent.com/tonlabs/DeBot-IS-consortium/main/SigningBoxInput/SigningBoxInput.sol"; +import "https://raw.githubusercontent.com/everx-labs/DeBot-IS-consortium/main/Terminal/Terminal.sol"; +import "https://raw.githubusercontent.com/everx-labs/DeBot-IS-consortium/main/SigningBoxInput/SigningBoxInput.sol"; contract testDebot is Debot { diff --git a/ton_client/src/tests/contracts/abi_v2/testDebot8.sol b/ton_client/src/tests/contracts/abi_v2/testDebot8.sol index cbab3a8df..872c39a7b 100644 --- a/ton_client/src/tests/contracts/abi_v2/testDebot8.sol +++ b/ton_client/src/tests/contracts/abi_v2/testDebot8.sol @@ -2,9 +2,9 @@ pragma ton-solidity >=0.40.0; pragma AbiHeader expire; pragma AbiHeader time; pragma AbiHeader pubkey; -import "https://raw.githubusercontent.com/tonlabs/debots/main/Debot.sol"; -import "https://raw.githubusercontent.com/tonlabs/DeBot-IS-consortium/main/Terminal/Terminal.sol"; -import "https://raw.githubusercontent.com/tonlabs/DeBot-IS-consortium/main/Network/Network.sol"; +import "https://raw.githubusercontent.com/everx-labs/debots/main/Debot.sol"; +import "https://raw.githubusercontent.com/everx-labs/DeBot-IS-consortium/main/Terminal/Terminal.sol"; +import "https://raw.githubusercontent.com/everx-labs/DeBot-IS-consortium/main/Network/Network.sol"; import "../Json.sol"; contract TestDebot8 is Debot { diff --git a/ton_client/src/tests/test_misc.rs b/ton_client/src/tests/test_misc.rs index cb1bf8844..9193ed0ef 100644 --- a/ton_client/src/tests/test_misc.rs +++ b/ton_client/src/tests/test_misc.rs @@ -13,7 +13,7 @@ use crate::encoding::{account_decode, account_encode_ex, AccountAddressType, Base64AddressParams}; use serde_json::{Value}; -use ton_block::MsgAddressInt; +use ever_block::MsgAddressInt; use std::str::FromStr; use crate::error::{ClientError}; use crate::tests::TestClient; @@ -436,8 +436,8 @@ fn test_address_parsing() { let base64 = "kf/8uRo6OBbQ97jCx2EIuKm8Wmt6Vb15+KsQHFLbKSMiYIny"; let base64_url = "kf_8uRo6OBbQ97jCx2EIuKm8Wmt6Vb15-KsQHFLbKSMiYIny"; - let address = ton_block::MsgAddressInt::with_standart(None, -1, hex::decode(short).unwrap().into()).unwrap(); - let wc0_address = ton_block::MsgAddressInt::with_standart(None, 0, hex::decode(short).unwrap().into()).unwrap(); + let address = ever_block::MsgAddressInt::with_standart(None, -1, hex::decode(short).unwrap().into()).unwrap(); + let wc0_address = ever_block::MsgAddressInt::with_standart(None, 0, hex::decode(short).unwrap().into()).unwrap(); assert_eq!(wc0_address, account_decode(short).expect("Couldn't parse short address")); assert_eq!(address, account_decode(full_std).expect("Couldn't parse full_std address")); diff --git a/ton_client/src/tvm/call_tvm.rs b/ton_client/src/tvm/call_tvm.rs index 2829ffd4e..62c0cb255 100644 --- a/ton_client/src/tvm/call_tvm.rs +++ b/ton_client/src/tvm/call_tvm.rs @@ -15,12 +15,12 @@ use super::types::ResolvedExecutionOptions; use crate::{error::ClientResult, encoding::slice_from_cell}; use crate::tvm::Error; -use ton_block::{ +use ever_block::{ Account, CommonMsgInfo, ConfigParams, CurrencyCollection, Deserializable, Message, MsgAddressInt, OutAction, OutActions, Serializable, }; -use ton_types::{Cell, HashmapType, SliceData, UInt256}; -use ton_vm::{ +use ever_block::{Cell, HashmapType, SliceData, UInt256}; +use ever_vm::{ executor::{gas::gas_state::Gas, Engine}, stack::{integer::IntegerData, savelist::SaveList, Stack, StackItem}, }; @@ -78,14 +78,14 @@ pub(crate) fn call_tvm( match engine.execute() { Err(err) => { - let exception = ton_vm::error::tvm_exception(err) + let exception = ever_vm::error::tvm_exception(err) .map_err(|err| Error::unknown_execution_error(err))?; let code = if let Some(code) = exception.custom_code() { code } else { !(exception .exception_code() - .unwrap_or(ton_types::ExceptionCode::UnknownError) as i32) + .unwrap_or(ever_block::ExceptionCode::UnknownError) as i32) }; let exit_arg = super::stack::serialize_item(&exception.value)?; @@ -120,13 +120,13 @@ pub(crate) fn call_tvm_msg( let mut stack = Stack::new(); let balance = account.balance().map_or(0, |cc| cc.grams.as_u128()); let function_selector = match msg.header() { - CommonMsgInfo::IntMsgInfo(_) => ton_vm::int!(0), - CommonMsgInfo::ExtInMsgInfo(_) => ton_vm::int!(-1), + CommonMsgInfo::IntMsgInfo(_) => ever_vm::int!(0), + CommonMsgInfo::ExtInMsgInfo(_) => ever_vm::int!(-1), CommonMsgInfo::ExtOutMsgInfo(_) => return Err(Error::invalid_message_type()), }; stack - .push(ton_vm::int!(balance)) // token balance of contract - .push(ton_vm::int!(0)) // token balance of msg + .push(ever_vm::int!(balance)) // token balance of contract + .push(ever_vm::int!(0)) // token balance of msg .push(StackItem::Cell(msg_cell.into())) // message .push(StackItem::Slice(msg.body().unwrap_or_default())) // message body .push(function_selector); // function selector @@ -165,9 +165,9 @@ fn build_contract_info( tr_lt: u64, code: Cell, init_code_hash: Option<&UInt256>, -) -> ton_vm::SmartContractInfo { +) -> ever_vm::SmartContractInfo { let mut info = - ton_vm::SmartContractInfo::with_myself( + ever_vm::SmartContractInfo::with_myself( address.serialize().and_then(|cell| SliceData::load_cell(cell)).unwrap_or_default() ); info.block_lt = block_lt; diff --git a/ton_client/src/tvm/check_transaction.rs b/ton_client/src/tvm/check_transaction.rs index 12a742d2e..f9885df88 100644 --- a/ton_client/src/tvm/check_transaction.rs +++ b/ton_client/src/tvm/check_transaction.rs @@ -13,7 +13,7 @@ use super::errors::Error; use crate::error::ClientResult; -use ton_block::AccStatusChange; +use ever_block::AccStatusChange; use ton_sdk::Transaction; pub(crate) async fn calc_transaction_fees( @@ -24,7 +24,7 @@ pub(crate) async fn calc_transaction_fees( show_tips_on_error: bool, ) -> ClientResult where - F: futures::Future>, + F: futures::Future>, { if !transaction.is_aborted() || skip_check { return Ok(transaction.calc_fees()); @@ -48,7 +48,7 @@ pub(crate) async fn extract_error( show_tips: bool, ) -> ClientResult<()> where - F: futures::Future>, + F: futures::Future>, { if let Some(storage) = &transaction.storage { if storage.status_change != AccStatusChange::Unchanged { diff --git a/ton_client/src/tvm/errors.rs b/ton_client/src/tvm/errors.rs index d492d21c9..c2ec172ab 100644 --- a/ton_client/src/tvm/errors.rs +++ b/ton_client/src/tvm/errors.rs @@ -15,8 +15,8 @@ use crate::boc::internal::deserialize_cell_from_base64; use crate::error::ClientError; use serde_json::Value; use std::fmt::Display; -use ton_block::{AccStatusChange, ComputeSkipReason, MsgAddressInt}; -use ton_types::{Cell, ExceptionCode}; +use ever_block::{AccStatusChange, ComputeSkipReason, MsgAddressInt}; +use ever_block::{Cell, ExceptionCode}; #[derive(ApiType)] pub enum ErrorCode { diff --git a/ton_client/src/tvm/run_get.rs b/ton_client/src/tvm/run_get.rs index 24caf208a..d650f12b3 100644 --- a/ton_client/src/tvm/run_get.rs +++ b/ton_client/src/tvm/run_get.rs @@ -21,8 +21,8 @@ use crate::crypto::internal::ton_crc16; use crate::error::ClientResult; use crate::tvm::Error; use std::sync::Arc; -use ton_vm::stack::integer::IntegerData; -use ton_vm::stack::{Stack, StackItem}; +use ever_vm::stack::integer::IntegerData; +use ever_vm::stack::{Stack, StackItem}; #[derive(Serialize, Deserialize, ApiType, Default, Clone)] pub struct ParamsOfRunGet { @@ -59,7 +59,7 @@ pub async fn run_get( context: Arc, params: ParamsOfRunGet, ) -> ClientResult { - let mut account: ton_block::Account = + let mut account: ever_block::Account = deserialize_object_from_boc(&context, ¶ms.account, "account")?.object; let options = ResolvedExecutionOptions::from_options(&context, params.execution_options).await?; diff --git a/ton_client/src/tvm/run_message.rs b/ton_client/src/tvm/run_message.rs index ec6765268..4db51d86b 100644 --- a/ton_client/src/tvm/run_message.rs +++ b/ton_client/src/tvm/run_message.rs @@ -27,12 +27,12 @@ use crate::{abi::Abi, boc::BocCacheType}; use serde_json::Value; use std::convert::TryFrom; use std::sync::{atomic::AtomicU64, Arc}; -use ton_block::{Account, CurrencyCollection, Message, MsgAddressInt, Serializable, Transaction}; -use ton_executor::{ +use ever_block::{Account, CurrencyCollection, Message, MsgAddressInt, Serializable, Transaction}; +use ever_executor::{ ExecuteParams, ExecutorError, OrdinaryTransactionExecutor, TransactionExecutor, }; use ton_sdk::TransactionFees; -use ton_types::{Cell, UInt256}; +use ever_block::{Cell, UInt256}; #[derive(Serialize, Deserialize, ApiType, Debug, Clone)] #[serde(tag = "type")] @@ -405,6 +405,7 @@ where signature_id: options.signature_id, ..ExecuteParams::default() }; + let msg = ever_block::CommonMessage::Std(msg); let transaction = match executor.execute_with_libs_and_params(Some(&msg), &mut account_root, params) { Ok(transaction) => transaction, diff --git a/ton_client/src/tvm/stack.rs b/ton_client/src/tvm/stack.rs index b846919c4..aa68c5c31 100644 --- a/ton_client/src/tvm/stack.rs +++ b/ton_client/src/tvm/stack.rs @@ -18,11 +18,11 @@ use crate::error::ClientResult; use crate::tvm::Error; use core::result::Result::{Err, Ok}; use serde_json::Value; -use ton_types::BuilderData; +use ever_block::BuilderData; use std::ops::Deref; use std::slice::Iter; -use ton_vm::stack::{continuation::ContinuationData, integer::IntegerData}; -use ton_vm::stack::StackItem; +use ever_vm::stack::{continuation::ContinuationData, integer::IntegerData}; +use ever_vm::stack::StackItem; enum ProcessingResult<'a> { Serialized(Value), diff --git a/ton_client/src/tvm/tests.rs b/ton_client/src/tvm/tests.rs index ed2bb5ce8..c090d8a3a 100644 --- a/ton_client/src/tvm/tests.rs +++ b/ton_client/src/tvm/tests.rs @@ -32,10 +32,10 @@ use crate::processing::{ParamsOfProcessMessage, ResultOfProcessMessage}; use crate::tests::{TestClient, EXCEPTION, HELLO, SUBSCRIBE}; use api_info::ApiModule; use serde_json::Value; -use ton_block::{GlobalCapabilities, ConfigParamEnum, Serializable, ConfigParam8}; +use ever_block::{GlobalCapabilities, ConfigParamEnum, Serializable, ConfigParam8}; use std::sync::Arc; -use ton_types::{BuilderData, Cell, SliceData}; -use ton_vm::stack::{continuation::ContinuationData, StackItem}; +use ever_block::{BuilderData, Cell, SliceData}; +use ever_vm::stack::{continuation::ContinuationData, StackItem}; const ELECTOR_ADDRESS: &str = "-1:3333333333333333333333333333333333333333333333333333333333333333"; const ELECTOR_CODE: &str = "te6ccgECXgEAD04AART/APSkE/S88sgLAQIBIAMCAFGl//8YdqJoegJ6AhE3Sqz4FXkgTio4EPgS+SAs+BR5IHF4E3kgeBSYQAIBSBcEEgGvDuDKmc/+c4wU4tUC3b34gbdFp4dI3KGnJ9xALfcqyQAGIAoFAgEgCQYCAVgIBwAzs+A7UTQ9AQx9AQwgwf0Dm+hk/oAMJIwcOKABbbCle1E0PQFIG6SMG3g2zwQJl8GbYT/jhsigwf0fm+lIJ0C+gAwUhBvAlADbwICkTLiAbPmMDGBUAUm5h12zwQNV8Fgx9tjhRREoAg9H5vpTIhlVIDbwIC3gGzEuZsIYXQIBIBALAgJyDQwBQqss7UTQ9AUgbpJbcODbPBAmXwaDB/QOb6GT+gAwkjBw4lQCAWoPDgGHuq7UTQ9AUgbpgwcFRwAG1TEeDbPG2E/44nJIMH9H5vpSCOGAL6ANMfMdMf0//T/9FvBFIQbwJQA28CApEy4gGz5jAzhUACO4ftRND0BSBukjBwlNDXCx/igCASAUEQIBWBMSAl+vS22eCBqvgsGPtsdPqIlAEHo/N9KQR0cBbZ43g6kIN4EoAbeBAUiZcQDZiXM2EMBdWwInrA6A7Z5Bg/oHN9DHQW2eSRg28UAWFQJTtkhbZ5Cf7bHTqiJQYP6PzfSkEdGAW2eKQg3gSgBt4EBSJlxANmJczYQwFhUCSts8bYMfjhIkgBD0fm+lMiGVUgNvAgLeAbPmMDMD0Ns8bwgDbwREQQIo2zwQNV8FgCD0Dm+hkjBt4ds8bGFdWwICxRkYASqqgjGCEE5Db2SCEM5Db2RZcIBA2zxWAgHJMRoSAW4a85Q1ufW1LEXymEEC7IZbucuD3mjLjoAesLeX8QB6AAhIIRsCAUgdHAHdQxgCT4M26SW3Dhcfgz0NcL//go+kQBpAK9sZJbcOCAIvgzIG6TXwNw4PANMDIC0IAo1yHXCx/4I1EToVy5k18GcOBcocE8kTGRMOKAEfgz0PoAMAOgUgKhcG0QNBAjcHDbPMj0APQAAc8Wye1Uf4UwIBIB8eA3k2zx/jzIkgCD0fG+lII8jAtMfMPgju1MUvbCPFTFUFUTbPBSgVHYTVHNY2zwDUFRwAd6RMuIBs+ZsYW6zgXUhcA5MAds8bFGTXwNw4QL0BFExgCD0Dm+hk18EcOGAQNch1wv/gCL4MyHbPIAk+DNY2zyxjhNwyMoAEvQA9AABzxbJ7VTwJjB/4F8DcIFQgIAAYIW6SW3CVAfkAAbriAgEgMCICASAlIwOnTbPIAi+DP5AFMBupNfB3DgIo4vUySAIPQOb6GOINMfMSDTH9P/MFAEuvK5+CNQA6DIyx9YzxZABIAg9EMCkxNfA+KSbCHif4rmIG6SMHDeAds8f4XSRcAJYjgCD0fG+lII48AtM/0/9TFbqOLjQD9AT6APoAKKsCUZmhUCmgBMjLPxbL/xL0AAH6AgH6AljPFlQgBYAg9EMDcAGSXwPikTLiAbMCASApJgP1AHbPDT4IyW5k18IcOBw+DNulF8I8CLggBH4M9D6APoA+gDTH9FTYbmUXwzwIuAElF8L8CLgBpNfCnDgIxBJUTJQd/AkIMAAILMrBhBbEEoQOU3d2zwjjhAxbFLI9AD0AAHPFsntVPAi4fANMvgjAaCmxCm2CYAQ+DPQgVFMnArqAENch1wsPUnC2CFMToIASyMsHUjDLH8sfGMsPF8sPGss/E/QAyXD4M9DXC/9TGNs8CfQEUFOgKKAJ+QAQSRA4QGVwbds8QDWAIPRDA8j0ABL0ABL0AAHPFsntVH8oWgBGghBOVlNUcIIAxP/IyxAVy/+DHfoCFMtqE8sfEss/zMlx+wAD9yAEPgz0NMP0w8x0w/RcbYJcG1/jkEpgwf0fG+lII4yAvoA0x/TH9P/0//RA6MEyMt/FMofUkDL/8nQURq2CMjLHxPL/8v/QBSBAaD0QQOkQxORMuIBs+YwNFi2CFMBuZdfB21wbVMR4G2K5jM0pVySbxHkcCCK5jY2WyKAvLSoBXsAAUkO5ErGXXwRtcG1TEeBTAaWSbxHkbxBvEHBTAG1tiuY0NDQ2UlW68rFQREMTKwH+Bm8iAW8kUx2DB/QOb6HyvfoAMdM/MdcL/1OcuY5dUTqoqw9SQLYIUUShJKo7LqkEUZWgUYmgghCOgSeKI5KAc5KAU+LIywfLH1JAy/9SoMs/I5QTy/8CkTPiVCKogBD0Q3AkyMv/Gss/UAX6AhjKAEAagwf0QwgQRRMUkmwx4iwBIiGOhUwA2zwKkVviBKQkbhUXSwFIAm8iAW8QBKRTSL6OkFRlBts8UwK8lGwiIgKRMOKRNOJTNr4TLgA0cAKOEwJvIiFvEAJvESSoqw8StggSoFjkMDEAZAOBAaD0km+lII4hAdN/URm2CAHTHzHXC/8D0x/T/zHXC/9BMBRvBFAFbwIEkmwh4rMUAANpwhIB6YZp0CmGybF0xQ4xcJ/WJasNDpUScmQJHtHvtlFfVnQACSA3MgTjpwF9IgDSSa+Bv/AQ67JBg19Jr4G+8G2eCBqvgoFpj6mJwBB6BzfQya+DP3CQa4WP/BHQkGCAya+DvnARbZ42ERn8Ee2eBcGF/KGZQYTQLFQA0wEoBdQNUCgD1CgEUBBBjtAoBlzJr4W98CoKAaoc25PAXUE2MwSk2zzJAts8UbODB/QOb6GUXw6A+uGBAUDXIfoAMFIIqbQfGaBSB7yUXwyA+eBRW7uUXwuA+OBtcFMHVSDbPAb5AEYJgwf0U5RfCoD34UZQEDcQJzVbQzQDIts8AoAg9EPbPDMQRRA0WNs8Wl1cADSAvMjKBxjL/xbMFMsfEssHy/8B+gIB+gLLHwA8gA34MyBuljCDI3GDCJ/Q0wcBwBryifoA+gD6ANHiAgEgOTgAHbsAH/BnoaQ/pD+kP64UPwR/2A6GmBgLjYSS+B8H0gGBDjgEdCGIDtnnAA6Y+Q4ABHQi2A7Z5waZ+RQQgnObol3UdCmQgR7Z5wEUEII7K6El1FdXTjoUeju2wtfKSxXibKZ8Z1s63gQ/coRQXeBsJHrAnPPrB7PzAAaOhDQT2zzgIoIQTkNvZLqPGDRUUkTbPJaCEM5Db2SShB/iQDNwgEDbPOAighDudk9LuiOCEO52T2+6UhCxTUxWOwSWjoYzNEMA2zzgMCKCEFJnQ3C6jqZUQxXwHoBAIaMiwv+XW3T7AnCDBpEy4gGCEPJnY1CgA0REcAHbPOA0IYIQVnRDcLrjAjMggx6wR1Y9PAEcjomEH0AzcIBA2zzhXwNWA6IDgwjXGCDTH9MP0x/T/9EDghBWdENQuvKlIds8MNMHgCCzErDAU/Kp0x8BghCOgSeKuvKp0//TPzBFZvkR8qJVAts8ghDWdFJAoEAzcIBA2zxFPlYEUNs8U5OAIPQOb6E7CpNfCn7hCds8NFtsIkk3GNs8MiHBAZMYXwjgIG5dW0I/AiqSMDSOiUNQ2zwxFaBQROJFE0RG2zxAXAKa0Ns8NDQ0U0WDB/QOb6GTXwZw4dP/0z/6ANIA0VIWqbQfFqBSULYIUVWhAsjL/8s/AfoCEsoAQEWDB/RDI6sCAqoCErYIUTOhREPbPFlBSwAu0gcBwLzyidP/1NMf0wfT//oA+gDTH9EDvlMjgwf0Dm+hlF8EbX/h2zwwAfkAAts8UxW9mV8DbQJzqdQAApI0NOJTUIAQ9A5voTGUXwdtcOD4I8jLH0BmgBD0Q1QgBKFRM7IkUDME2zxANIMH9EMBwv+TMW1x4AFyRkRDAByALcjLBxTMEvQAy//KPwAe0wcBwC3yidT0BNP/0j/RARjbPDJZgBD0Dm+hMAFGACyAIvgzINDTBwHAEvKogGDXIdM/9ATRAqAyAvpEcPgz0NcL/+1E0PQEBKRavbEhbrGSXwTg2zxsUVIVvQSzFLGSXwPg+AABkVuOnfQE9AT6AEM02zxwyMoAE/QA9ABZoPoCAc8Wye1U4lRIA0QBgCD0Zm+hkjBw4ds8MGwzIMIAjoQQNNs8joUwECPbPOISW0pJAXJwIH+OrSSDB/R8b6Ugjp4C0//TPzH6ANIA0ZQxUTOgjodUGIjbPAcD4lBDoAORMuIBs+YwMwG68rtLAZhwUwB/jrcmgwf0fG+lII6oAtP/0z8x+gDSANGUMVEzoI6RVHcIqYRRZqBSF6BLsNs8CQPiUFOgBJEy4gGz5jA1A7pTIbuw8rsSoAGhSwAyUxKDB/QOb6GU+gAwoJEw4sgB+gICgwf0QwBucPgzIG6TXwRw4NDXC/8j+kQBpAK9sZNfA3Dg+AAB1CH7BCDHAJJfBJwB0O0e7VMB8QaC8gDifwLWMSH6RAGkjo4wghD////+QBNwgEDbPODtRND0BPQEUDODB/Rmb6GOj18EghD////+QBNwgEDbPOE2BfoA0QHI9AAV9AABzxbJ7VSCEPlvcyRwgBjIywVQBM8WUAT6AhLLahLLH8s/yYBA+wBWVhTEphKDVdBJFPEW0/xcbn16xYfvSOeP/puknaDtlqylDccABSP6RO1E0PQEIW4EpBSxjocQNV8FcNs84ATT/9Mf0x/T/9QB0IMI1xkB0YIQZUxQdMjLH1JAyx9SMMsfUmDL/1Igy//J0FEV+RGOhxBoXwhx2zzhIYMPuY6HEGhfCHbbPOAHVVVVTwRW2zwxDYIQO5rKAKEgqgsjuY6HEL1fDXLbPOBRIqBRdb2OhxCsXwxz2zzgDFRVVVAEwI6HEJtfC3DbPOBTa4MH9A5voSCfMPoAWaAB0z8x0/8wUoC9kTHijocQm18LdNs84FMBuY6HEJtfC3XbPOAg8qz4APgjyFj6AssfFMsfFsv/GMv/QDiDB/RDEEVBMBZwcFVVVVECJts8yPQAWM8Wye1UII6DcNs84FtTUgEgghDzdEhMWYIQO5rKAHLbPFYAKgbIyx8Vyx9QA/oCAfoC9ADKAMoAyQAg0NMf0x/6APoA9ATSANIA0QEYghDub0VMWXCAQNs8VgBEcIAYyMsFUAfPFlj6AhXLahPLH8s/IcL/kssfkTHiyQH7AARU2zwH+kQBpLEhwACxjogFoBA1VRLbPOBTAoAg9A5voZQwBaAB4w0QNUFDXVxZWAEE2zxcAiDbPAygVQUL2zxUIFOAIPRDW1oAKAbIyx8Vyx8Ty//0AAH6AgH6AvQAAB7TH9Mf0//0BPoA+gD0BNEAKAXI9AAU9AAS9AAB+gLLH8v/ye1UACDtRND0BPQE9AT6ANMf0//R"; diff --git a/ton_client/src/tvm/types.rs b/ton_client/src/tvm/types.rs index 6abee141d..218c4e888 100644 --- a/ton_client/src/tvm/types.rs +++ b/ton_client/src/tvm/types.rs @@ -18,8 +18,8 @@ use crate::error::ClientResult; use crate::net::network_params::get_default_params; use crate::boc::internal::deserialize_object_from_boc; use std::sync::Arc; -use ton_executor::BlockchainConfig; -use ton_vm::executor::BehaviorModifiers; +use ever_executor::BlockchainConfig; +use ever_vm::executor::BehaviorModifiers; #[derive(Serialize, Deserialize, ApiType, Clone, Default)] pub struct ExecutionOptions { diff --git a/ton_client/src/utils/calc_storage_fee.rs b/ton_client/src/utils/calc_storage_fee.rs index 65816471c..98727ab01 100644 --- a/ton_client/src/utils/calc_storage_fee.rs +++ b/ton_client/src/utils/calc_storage_fee.rs @@ -38,7 +38,7 @@ pub async fn calc_storage_fee( params: ParamsOfCalcStorageFee, ) -> ClientResult { let account = - deserialize_object_from_boc::(&context, ¶ms.account, "account")? + deserialize_object_from_boc::(&context, ¶ms.account, "account")? .object; let storage = account diff --git a/ton_client/src/utils/conversion.rs b/ton_client/src/utils/conversion.rs index 5d8c7e8ca..d217058cc 100644 --- a/ton_client/src/utils/conversion.rs +++ b/ton_client/src/utils/conversion.rs @@ -16,7 +16,7 @@ use crate::client::ClientContext; use crate::encoding::{account_decode, account_encode_ex, AccountAddressType, Base64AddressParams, decode_std_base64}; use crate::error::ClientResult; use std::sync::Arc; -use ton_block::MsgAddressInt; +use ever_block::MsgAddressInt; use std::str::FromStr; @@ -113,6 +113,6 @@ pub fn get_address_type( #[cfg(test)] pub fn abi_uint(n: u128, size: usize) -> serde_json::Value { - serde_json::to_value(ton_abi::TokenValue::Uint(ton_abi::Uint::new(n, size))) + serde_json::to_value(ever_abi::TokenValue::Uint(ever_abi::Uint::new(n, size))) .unwrap_or(Default::default()) } diff --git a/ton_client/src/utils/json.rs b/ton_client/src/utils/json.rs index bfd029e78..57c95bb70 100644 --- a/ton_client/src/utils/json.rs +++ b/ton_client/src/utils/json.rs @@ -1,6 +1,6 @@ use failure::err_msg; use serde_json::Value; -use ton_types::Result; +use ever_block::Result; pub trait JsonHelper { fn get_u64(&self, field: &str) -> Result; diff --git a/ton_client_processing/Cargo.toml b/ton_client_processing/Cargo.toml index 7d840660f..d44238da0 100644 --- a/ton_client_processing/Cargo.toml +++ b/ton_client_processing/Cargo.toml @@ -1,7 +1,7 @@ [package] name = 'ton_client_processing' -version = '1.45.1' -authors = [ 'TON Labs LTD ' ] +version = '1.46.1' +authors = [ 'TON Labs LTD ' ] edition = '2018' license = 'Apache-2.0' @@ -10,8 +10,7 @@ name = 'ton_client_processing' crate-type = [ 'cdylib', 'rlib', 'staticlib' ] [dependencies] -ton_block = { git = 'https://github.com/tonlabs/ever-block.git', tag = '1.9.118' } -ton_types = { git = 'https://github.com/tonlabs/ever-types.git', tag = '2.0.31' } +ever_block = { git = 'https://github.com/everx-labs/ever-block.git', tag = '1.10.4' } api_derive = { path = '../api/derive' } api_info = { path = '../api/info' } diff --git a/ton_client_processing/src/message_monitor/message.rs b/ton_client_processing/src/message_monitor/message.rs index e7381ee99..7d965fbbd 100644 --- a/ton_client_processing/src/message_monitor/message.rs +++ b/ton_client_processing/src/message_monitor/message.rs @@ -1,6 +1,6 @@ use crate::{error, MessageMonitorSdkServices}; use serde_json::Value; -use ton_types::Cell; +use ever_block::Cell; #[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize, ApiType)] #[serde(tag = "type")] diff --git a/ton_client_processing/src/sdk_services/mock_sdk_services.rs b/ton_client_processing/src/sdk_services/mock_sdk_services.rs index f6f9ca6ad..a51f0474c 100644 --- a/ton_client_processing/src/sdk_services/mock_sdk_services.rs +++ b/ton_client_processing/src/sdk_services/mock_sdk_services.rs @@ -5,7 +5,7 @@ use std::collections::{HashMap, HashSet}; use std::future::Future; use std::sync::{Arc, Mutex, RwLock}; use std::time::{Duration, SystemTime}; -use ton_types::Cell; +use ever_block::Cell; #[derive(Clone)] pub struct MockSdkServices { @@ -90,7 +90,7 @@ impl State { .map_err(|err| { Error::invalid_boc(format!("error decode {} BOC base64: {}", name, err)) })?; - ton_types::boc::read_single_root_boc(&bytes).map_err(|err| { + ever_block::boc::read_single_root_boc(&bytes).map_err(|err| { Error::invalid_boc(format!("{} BOC deserialization error: {}", name, err)) }) } diff --git a/ton_client_processing/src/sdk_services/mod.rs b/ton_client_processing/src/sdk_services/mod.rs index 90d00f7e4..7ec05689c 100644 --- a/ton_client_processing/src/sdk_services/mod.rs +++ b/ton_client_processing/src/sdk_services/mod.rs @@ -6,7 +6,7 @@ use crate::message_monitor::{MessageMonitoringParams, MessageMonitoringResult}; #[cfg(test)] pub use mock_sdk_services::MockSdkServices; use std::future::Future; -use ton_types::Cell; +use ever_block::Cell; pub struct NetSubscription(pub usize); diff --git a/ton_client_processing/src/tests.rs b/ton_client_processing/src/tests.rs index 1174a7ef5..3f173ac26 100644 --- a/ton_client_processing/src/tests.rs +++ b/ton_client_processing/src/tests.rs @@ -8,8 +8,8 @@ use std::mem; use std::sync::{Arc, RwLock}; use std::time::Duration; use tokio::time::sleep; -use ton_block::MsgAddrStd; -use ton_types::{AccountId, UInt256}; +use ever_block::MsgAddrStd; +use ever_block::{AccountId, UInt256}; #[tokio::test(flavor = "multi_thread", worker_threads = 2)] async fn test_fetch() { diff --git a/ton_sdk/Cargo.toml b/ton_sdk/Cargo.toml index 4a7bc9f44..cb82e5b1c 100644 --- a/ton_sdk/Cargo.toml +++ b/ton_sdk/Cargo.toml @@ -1,14 +1,13 @@ [package] name = 'ton_sdk' -version = '1.45.1' +version = '1.46.1' edition = '2018' license = 'Apache-2.0' -authors = [ 'TON Labs LTD ' ] +authors = [ 'TON Labs LTD ' ] [dependencies] -ton_abi = { git = 'https://github.com/tonlabs/ever-abi.git', tag = '2.4.10' } -ton_block = { git = 'https://github.com/tonlabs/ever-block.git', tag = '1.9.118' } -ton_types = { git = 'https://github.com/tonlabs/ever-types.git', tag = '2.0.31' } +ever_abi = { git = 'https://github.com/everx-labs/ever-abi.git', tag = '2.5.5' } +ever_block = { git = 'https://github.com/everx-labs/ever-block.git', tag = '1.10.4' } api_info = { path = '../api/info' } api_derive = { path = '../api/derive' } diff --git a/ton_sdk/src/contract.rs b/ton_sdk/src/contract.rs index 9bd0109a6..2d66f7b2a 100644 --- a/ton_sdk/src/contract.rs +++ b/ton_sdk/src/contract.rs @@ -17,14 +17,14 @@ use crate::{AbiContract, MessageId}; use chrono::prelude::Utc; use serde_json::Value; -use ton_abi::PublicKeyData; +use ever_abi::PublicKeyData; use std::convert::{Into, TryInto}; use std::io::{Read, Seek}; -use ton_abi::json_abi::DecodedMessage; -use ton_block::{AccountIdPrefixFull, Deserializable, ExternalInboundMessageHeader, GetRepresentationHash, +use ever_abi::json_abi::DecodedMessage; +use ever_block::{AccountIdPrefixFull, Deserializable, ExternalInboundMessageHeader, GetRepresentationHash, Message as TvmMessage, MsgAddressInt, Serializable, ShardIdent, StateInit, InternalMessageHeader, CurrencyCollection}; -use ton_types::{error, fail, AccountId, Result, SliceData, BocReader, Ed25519PrivateKey}; +use ever_block::{error, fail, AccountId, Result, SliceData, BocReader, Ed25519PrivateKey}; pub struct Contract {} @@ -105,7 +105,7 @@ impl ContractImage { Ok(result) } - pub fn from_cell(cell: ton_types::Cell) -> Result { + pub fn from_cell(cell: ever_block::Cell) -> Result { let id = cell.repr_hash().into(); let state_init = StateInit::construct_from_cell(cell)?; @@ -135,7 +135,7 @@ impl ContractImage { pub fn get_serialized_code(&self) -> Result> { match &self.state_init.code { - Some(cell) => ton_types::boc::write_boc(cell), + Some(cell) => ever_block::boc::write_boc(cell), None => bail!(SdkError::InvalidData { msg: "State init has no code".to_owned() }), @@ -144,7 +144,7 @@ impl ContractImage { pub fn get_serialized_data(&self) -> Result> { match &self.state_init.data { - Some(cell) => ton_types::boc::write_boc(cell), + Some(cell) => ever_block::boc::write_boc(cell), None => bail!(SdkError::InvalidData { msg: "State init has no data".to_owned() }), @@ -152,7 +152,7 @@ impl ContractImage { } pub fn serialize(&self) -> Result> { - ton_types::boc::write_boc(&self.state_init.serialize()?) + ever_block::boc::write_boc(&self.state_init.serialize()?) } // Returns future contract's state_init struct @@ -176,14 +176,14 @@ impl ContractImage { ///Allows to change initial values for public contract variables pub fn update_data(&mut self, data_map_supported: bool, data_json: &str, abi_json: &str) -> Result<()> { let new_data = if data_map_supported { - ton_abi::json_abi::update_contract_data( + ever_abi::json_abi::update_contract_data( abi_json, data_json, SliceData::load_cell(self.state_init.data.clone().unwrap_or_default())?, )? .into_cell() } else { - ton_abi::json_abi::encode_storage_fields(abi_json, Some(data_json))? + ever_abi::json_abi::encode_storage_fields(abi_json, Some(data_json))? .into_cell()? }; @@ -215,7 +215,7 @@ impl Contract { internal: bool, allow_partial: bool, ) -> Result { - ton_abi::json_abi::decode_function_response( + ever_abi::json_abi::decode_function_response( abi, function, response, @@ -244,7 +244,7 @@ impl Contract { internal: bool, allow_partial: bool, ) -> Result { - ton_abi::json_abi::decode_unknown_function_response(abi, response, internal, allow_partial) + ever_abi::json_abi::decode_unknown_function_response(abi, response, internal, allow_partial) } /// Decodes output parameters returned by contract function call from serialized message body @@ -266,7 +266,7 @@ impl Contract { internal: bool, allow_partial: bool, ) -> Result { - ton_abi::json_abi::decode_unknown_function_call(abi, response, internal, allow_partial) + ever_abi::json_abi::decode_unknown_function_call(abi, response, internal, allow_partial) } /// Decodes output parameters returned by contract function call from serialized message body @@ -292,7 +292,7 @@ impl Contract { key_pair: Option<&Ed25519PrivateKey>, ) -> Result { // pack params into bag of cells via ABI - let msg_body = ton_abi::encode_function_call( + let msg_body = ever_abi::encode_function_call( ¶ms.abi, ¶ms.func, params.header.as_deref(), @@ -327,7 +327,7 @@ impl Contract { params: &FunctionCallSet, ) -> Result { // pack params into bag of cells via ABI - let msg_body = ton_abi::encode_function_call( + let msg_body = ever_abi::encode_function_call( ¶ms.abi, ¶ms.func, None, @@ -380,7 +380,7 @@ impl Contract { params: &FunctionCallSet, ) -> Result { // pack params into bag of cells via ABI - let (msg_body, data_to_sign) = ton_abi::prepare_function_call_for_sign( + let (msg_body, data_to_sign) = ever_abi::prepare_function_call_for_sign( ¶ms.abi, ¶ms.func, params.header.as_deref(), @@ -408,7 +408,7 @@ impl Contract { key_pair: Option<&Ed25519PrivateKey>, workchain_id: i32, ) -> Result { - let msg_body = ton_abi::encode_function_call( + let msg_body = ever_abi::encode_function_call( ¶ms.abi, ¶ms.func, params.header.as_deref(), @@ -482,7 +482,7 @@ impl Contract { image: ContractImage, workchain_id: i32, ) -> Result { - let (msg_body, data_to_sign) = ton_abi::prepare_function_call_for_sign( + let (msg_body, data_to_sign) = ever_abi::prepare_function_call_for_sign( ¶ms.abi, ¶ms.func, params.header.as_deref(), @@ -510,7 +510,7 @@ impl Contract { bounce: bool, value: CurrencyCollection, ) -> Result> { - let msg_body = ton_abi::encode_function_call( + let msg_body = ever_abi::encode_function_call( ¶ms.abi, ¶ms.func, None, @@ -551,7 +551,7 @@ impl Contract { msg: "No message body".to_owned() }))?; - let signed_body = ton_abi::add_sign_to_function_call( + let signed_body = ever_abi::add_sign_to_function_call( abi, signature.try_into()?, public_key.map(|slice| slice.try_into()).transpose()?, @@ -692,14 +692,14 @@ impl Contract { pub fn serialize_message(msg: &TvmMessage) -> Result<(Vec, MessageId)> { let cells = msg.write_to_new_cell()?.into_cell()?; Ok(( - ton_types::boc::write_boc(&cells)?, + ever_block::boc::write_boc(&cells)?, (&cells.repr_hash().as_slice()[..]).into(), )) } /// Deserializes tree of cells from byte array into `SliceData` pub fn deserialize_tree_to_slice(data: &[u8]) -> Result { - SliceData::load_cell(ton_types::boc::read_single_root_boc(&data)?) + SliceData::load_cell(ever_block::boc::read_single_root_boc(&data)?) } pub fn get_dst_from_msg(msg: &[u8]) -> Result { diff --git a/ton_sdk/src/json_helper.rs b/ton_sdk/src/json_helper.rs index df014493e..08e670035 100644 --- a/ton_sdk/src/json_helper.rs +++ b/ton_sdk/src/json_helper.rs @@ -15,10 +15,10 @@ use crate::MessageType; use serde::de::Error; use std::fmt; use std::str::FromStr; -use ton_block::{ +use ever_block::{ AccStatusChange, AccountStatus, ComputeSkipReason, MsgAddressInt, TransactionProcessingStatus, }; -use ton_types::Cell; +use ever_block::Cell; pub struct StringVisitor; @@ -107,7 +107,7 @@ pub mod opt_cell { S: serde::Serializer, { if let Some(cell) = value { - let str_value = base64::encode(&ton_types::boc::write_boc(&cell).map_err(|err| { + let str_value = base64::encode(&ever_block::boc::write_boc(&cell).map_err(|err| { serde::ser::Error::custom(format!("Cannot serialize BOC: {}", err)) })?); serializer.serialize_some(&str_value) @@ -124,7 +124,7 @@ where let bytes = base64::decode(&b64) .map_err(|err| D::Error::custom(format!("error decode base64: {}", err)))?; - ton_types::boc::read_single_root_boc(&bytes) + ever_block::boc::read_single_root_boc(&bytes) .map_err(|err| D::Error::custom(format!("BOC read error: {}", err))) } diff --git a/ton_sdk/src/lib.rs b/ton_sdk/src/lib.rs index 8253c4ed3..8c5d5f346 100644 --- a/ton_sdk/src/lib.rs +++ b/ton_sdk/src/lib.rs @@ -20,10 +20,10 @@ extern crate api_info; #[macro_use] extern crate api_derive; -pub use ton_abi::json_abi; -pub use ton_abi::Contract as AbiContract; -pub use ton_abi::Function as AbiFunction; -pub use ton_abi::Event as AbiEvent; +pub use ever_abi::json_abi; +pub use ever_abi::Contract as AbiContract; +pub use ever_abi::Function as AbiFunction; +pub use ever_abi::Event as AbiEvent; mod error; pub use error::SdkError; diff --git a/ton_sdk/src/message.rs b/ton_sdk/src/message.rs index e9971f82e..083c2fe4e 100644 --- a/ton_sdk/src/message.rs +++ b/ton_sdk/src/message.rs @@ -13,11 +13,11 @@ use crate::json_helper; use crate::types::{StringId, grams_to_u64}; -use ton_types::Result; +use ever_block::Result; -use ton_block::GetRepresentationHash; -use ton_block::{CommonMsgInfo, Message as TvmMessage}; -use ton_types::{Cell, SliceData}; +use ever_block::GetRepresentationHash; +use ever_block::{CommonMsgInfo, Message as TvmMessage}; +use ever_block::{Cell, SliceData}; #[derive(Deserialize, Debug, PartialEq, Clone)] pub enum MessageType { diff --git a/ton_sdk/src/transaction.rs b/ton_sdk/src/transaction.rs index dedba2299..8ae1378e3 100644 --- a/ton_sdk/src/transaction.rs +++ b/ton_sdk/src/transaction.rs @@ -17,11 +17,11 @@ use crate::types::grams_to_u64; use crate::types::StringId; use crate::{Message, MessageId}; -use ton_block::{ +use ever_block::{ AccStatusChange, ComputeSkipReason, GetRepresentationHash, TrComputePhase, TransactionDescr, TransactionProcessingStatus, }; -use ton_types::Result; +use ever_block::Result; use std::convert::TryFrom; @@ -81,9 +81,9 @@ pub struct Transaction { pub total_fees: u64, } -impl TryFrom<&ton_block::Transaction> for Transaction { +impl TryFrom<&ever_block::Transaction> for Transaction { type Error = failure::Error; - fn try_from(transaction: &ton_block::Transaction) -> Result { + fn try_from(transaction: &ever_block::Transaction) -> Result { let descr = if let TransactionDescr::Ordinary(descr) = transaction.read_description()? { descr } else { @@ -136,7 +136,11 @@ impl TryFrom<&ton_block::Transaction> for Transaction { None }; - let in_msg = transaction.in_msg.as_ref().map(|msg| msg.hash().into()); + let in_msg = if transaction.in_msg.empty() { + None + } else { + Some(transaction.in_msg.hash().into()) + }; let mut out_msgs = vec![]; transaction.out_msgs.iterate_slices(|slice| { if let Ok(cell) = slice.reference(0) { @@ -146,7 +150,7 @@ impl TryFrom<&ton_block::Transaction> for Transaction { })?; let mut out_messages = vec![]; transaction.out_msgs.iterate(|msg| { - out_messages.push(Message::with_msg(&msg.0)?); + out_messages.push(Message::with_msg(msg.0.get_std()?)?); Ok(true) })?; diff --git a/ton_sdk/src/types.rs b/ton_sdk/src/types.rs index 60390d693..e424f610f 100644 --- a/ton_sdk/src/types.rs +++ b/ton_sdk/src/types.rs @@ -13,7 +13,7 @@ use num_traits::cast::ToPrimitive; use std::fmt; -use ton_types::{Result, UInt256}; +use ever_block::{Result, UInt256}; use crate::error::SdkError; @@ -69,7 +69,7 @@ impl StringId { } } -pub fn grams_to_u64(grams: &ton_block::types::Grams) -> Result { +pub fn grams_to_u64(grams: &ever_block::types::Grams) -> Result { grams.as_u128().to_u64().ok_or_else(|| { SdkError::InvalidData { msg: format!("Cannot convert grams value {}", grams), diff --git a/toncli/Cargo.toml b/toncli/Cargo.toml index 33a929219..f505c657e 100644 --- a/toncli/Cargo.toml +++ b/toncli/Cargo.toml @@ -1,15 +1,15 @@ [package] -authors = [ 'TON Labs LTD ' ] +authors = [ 'TON Labs LTD ' ] description = 'TON CLient Command Line Tool' documentation = 'https://docs.ton.dev' edition = '2018' homepage = 'https://ton.dev' -keywords = [ 'TON', 'SDK', 'smart contract', 'tonlabs' ] +keywords = [ 'TON', 'SDK', 'smart contract', 'everx-labs' ] license = 'Apache-2.0' name = 'toncli' readme = 'README.md' -repository = 'https://github.com/tonlabs/ever-sdk' -version = '1.45.1' +repository = 'https://github.com/everx-labs/ever-sdk' +version = '1.46.1' [dependencies] base64 = '0.13.0' diff --git a/tools/api.json b/tools/api.json index c9ff7bb6b..097ae6f82 100644 --- a/tools/api.json +++ b/tools/api.json @@ -1,5 +1,5 @@ { - "version": "1.45.1", + "version": "1.46.1", "modules": [ { "name": "client", @@ -7655,7 +7655,7 @@ { "name": "decode_boc", "summary": "Decodes BOC into JSON as a set of provided parameters.", - "description": "Solidity functions use ABI types for [builder encoding](https://github.com/tonlabs/TON-Solidity-Compiler/blob/master/API.md#tvmbuilderstore).\nThe simplest way to decode such a BOC is to use ABI decoding.\nABI has it own rules for fields layout in cells so manually encoded\nBOC can not be described in terms of ABI rules.\n\nTo solve this problem we introduce a new ABI type `Ref()`\nwhich allows to store `ParamType` ABI parameter in cell reference and, thus,\ndecode manually encoded BOCs. This type is available only in `decode_boc` function\nand will not be available in ABI messages encoding until it is included into some ABI revision.\n\nSuch BOC descriptions covers most users needs. If someone wants to decode some BOC which\ncan not be described by these rules (i.e. BOC with TLB containing constructors of flags\ndefining some parsing conditions) then they can decode the fields up to fork condition,\ncheck the parsed data manually, expand the parsing schema and then decode the whole BOC\nwith the full schema.", + "description": "Solidity functions use ABI types for [builder encoding](https://github.com/everx-labs/TON-Solidity-Compiler/blob/master/API.md#tvmbuilderstore).\nThe simplest way to decode such a BOC is to use ABI decoding.\nABI has it own rules for fields layout in cells so manually encoded\nBOC can not be described in terms of ABI rules.\n\nTo solve this problem we introduce a new ABI type `Ref()`\nwhich allows to store `ParamType` ABI parameter in cell reference and, thus,\ndecode manually encoded BOCs. This type is available only in `decode_boc` function\nand will not be available in ABI messages encoding until it is included into some ABI revision.\n\nSuch BOC descriptions covers most users needs. If someone wants to decode some BOC which\ncan not be described by these rules (i.e. BOC with TLB containing constructors of flags\ndefining some parsing conditions) then they can decode the fields up to fork condition,\ncheck the parsed data manually, expand the parsing schema and then decode the whole BOC\nwith the full schema.", "params": [ { "name": "context", @@ -8784,7 +8784,7 @@ "functions": [ { "name": "decode_tvc", - "summary": "Decodes tvc according to the tvc spec. Read more about tvc structure here https://github.com/tonlabs/ever-struct/blob/main/src/scheme/mod.rs#L30", + "summary": "Decodes tvc according to the tvc spec. Read more about tvc structure here https://github.com/everx-labs/ever-struct/blob/main/src/scheme/mod.rs#L30", "description": null, "params": [ { diff --git a/tools/update_trusted_blocks/Cargo.toml b/tools/update_trusted_blocks/Cargo.toml index 340d02c09..71c640e2c 100644 --- a/tools/update_trusted_blocks/Cargo.toml +++ b/tools/update_trusted_blocks/Cargo.toml @@ -11,4 +11,4 @@ serde_derive = '1.0.130' serde_json = '1.0.68' tokio = { default-features = false, features = [ 'sync', 'fs' ], version = '1' } ton_client = { path = '../../ton_client' } -ton_types = { git = 'https://github.com/tonlabs/ton-labs-types.git', tag = '1.11.4' } +ever_block = { git = 'https://github.com/everx-labs/ever-block.git', tag = '1.10.4' } diff --git a/tools/update_trusted_blocks/src/main.rs b/tools/update_trusted_blocks/src/main.rs index 5d88cca1a..ffecd702b 100644 --- a/tools/update_trusted_blocks/src/main.rs +++ b/tools/update_trusted_blocks/src/main.rs @@ -1,12 +1,10 @@ -use std::collections::HashMap; -use std::sync::Arc; -use std::env; +use std::{collections::HashMap, env, str::FromStr, sync::Arc}; use serde_json::json; use ton_client::ClientContext; use ton_client::net::{OrderBy, ParamsOfQueryCollection, query_collection, SortDirection}; use ton_client::proofs::{ParamsOfProofBlockData, proof_block_data}; -use ton_types::{Result, UInt256}; +use ever_block::{Result, UInt256}; fn with_project(endpoint: &str) -> String { let key = "EVERCLOUD_AUTH_PROJECT"; @@ -24,7 +22,7 @@ fn with_project(endpoint: &str) -> String { async fn query_network_keyblocks( endpoint: String, - zs_root_hash: UInt256, + zs_root_hash: &UInt256, trusted_blocks: Option>, ) -> Result> { println!("*** [{}] ***", endpoint); @@ -135,8 +133,8 @@ async fn main() -> Result<()> { let endpoint = with_project(network).to_owned(); let value = query_network_keyblocks( endpoint, - zs_root_hash, - trusted_key_blocks.remove(&zs_root_hash.inner()), + &zs_root_hash, + trusted_key_blocks.remove(zs_root_hash.as_slice()), ).await?; trusted_key_blocks.insert(zs_root_hash.inner(), value); }