Merge pull request #1415 from multiversx/feat/unified

feat: unified syntax

.gitignore

@@ -8,6 +8,7 @@
 # The root Cargo.lock is kept for dependabot.
 contracts/**/Cargo.lock
 !contracts/**/wasm*/Cargo.lock
+contracts/**/output*/
 data/**/Cargo.lock
 framework/**/Cargo.lock
 sdk/**/Cargo.lock

CHANGELOG.md

@@ -26,15 +26,29 @@ They are:
 - `multiversx-chain-scenario-format`, in short `scenario-format`, scenario JSON serializer/deserializer, 1 crate.
 - `multiversx-sdk`, in short `sdk`, allows communication with the chain(s), 1 crate.
 
+
 ## [sc 0.48.1, codec 0.18.7] - 2024-04-30
 - Simplified decoding of small numbers (i64/u64).
 - Manual reset of the `StaticApi`, in order to free memory for long-running tasks.
 
+## [sc 0.49.0-alpha.4, sdk 0.4.0-alpha.4] - 2024-04-23
+Fourth pre-release, contains many interactor improvements, including improved tx polling.
+
+## [sc 0.49.0-alpha.3] - 2024-04-13
+Third pre-release of the unified syntax, includes backwards compatibility fixes and testing set state/check state.
+
+## [sc 0.49.0-alpha.2] - 2024-04-09
+Second pre-release of the unified syntax. Most features done, including fully featured interactors.
+Still missing: set state/check state in tests.
+
 ## [sc 0.48.0] - 2024-04-09
 - When serializing to a managed buffer, static buffer caching is disabled by default.
 - `sc-meta:` - installers for wasm32 target and wasm-opt.
 - Integrated traits for token management: `FixedSupplyToken`, `Mergeable`.
 
+## [sc 0.48.0-alpha.1] - 2024-03-27 (actually alpha release of 0.49.0)
+First pre-release of the unified syntax. Syntax not yet stabilized, should only be used for experimenting with various smart contracts.
+
 ## [sc 0.47.8] - 2024-03-22
 - Test coverage functionality in sc-meta.
 - Removed deprecation from legacy whitebox testing framework, since it is still used extensively.

Cargo.toml

@@ -125,6 +125,8 @@ members = [
   "contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/meta",
   "contracts/feature-tests/composability/forwarder",
   "contracts/feature-tests/composability/forwarder/meta",
+  "contracts/feature-tests/composability/forwarder-legacy",
+  "contracts/feature-tests/composability/forwarder-legacy/meta",
   "contracts/feature-tests/composability/forwarder-queue",
   "contracts/feature-tests/composability/forwarder-queue/meta",
   "contracts/feature-tests/composability/forwarder-raw",
@@ -159,6 +161,8 @@ members = [
   "contracts/feature-tests/erc-style-contracts/lottery-erc20/meta",
   "contracts/feature-tests/esdt-system-sc-mock",
   "contracts/feature-tests/esdt-system-sc-mock/meta",
+  "contracts/feature-tests/exchange-features",
+  "contracts/feature-tests/exchange-features/meta",
   "contracts/feature-tests/formatted-message-features",
   "contracts/feature-tests/formatted-message-features/meta",
   "contracts/feature-tests/managed-map-features",
@@ -173,9 +177,8 @@ members = [
   "contracts/feature-tests/rust-snippets-generator-test/meta",
   "contracts/feature-tests/rust-testing-framework-tester",
   "contracts/feature-tests/rust-testing-framework-tester/meta",
+  "contracts/feature-tests/scenario-tester",
+  "contracts/feature-tests/scenario-tester/meta",
   "contracts/feature-tests/use-module",
   "contracts/feature-tests/use-module/meta",
-  "contracts/feature-tests/exchange-features",
-  "contracts/feature-tests/exchange-features/meta",
-
 ]

contracts/benchmarks/large-storage/Cargo.toml

@@ -9,9 +9,9 @@ publish = false
 path = "src/large_storage.rs"
 
 [dependencies.multiversx-sc]
-version = "0.48.1"
+version = "0.49.0-alpha.4"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.1"
+version = "0.49.0-alpha.4"
 path = "../../../framework/scenario"

contracts/benchmarks/large-storage/meta/Cargo.toml

@@ -8,6 +8,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.48.1"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/meta"
 default-features = false

contracts/benchmarks/large-storage/wasm/Cargo.toml

@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.48.1"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]

contracts/benchmarks/mappers/benchmark-common/Cargo.toml

@@ -9,9 +9,9 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.48.1"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.1"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/scenario"

contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml

@@ -13,9 +13,9 @@ path = "../benchmark-common"
 
 
 [dependencies.multiversx-sc]
-version = "0.48.1"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.48.1"
+version = "0.49.0-alpha.4"
 path = "../../../../framework/scenario"

contracts/benchmarks/mappers/linked-list-repeat/meta/Cargo.toml

@@ -9,6 +9,6 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.48.1"
+version = "0.49.0-alpha.4"
 path = "../../../../../framework/meta"
 default-features = false

contracts/benchmarks/mappers/linked-list-repeat/tests/linked_list_repeat_blackbox_test.rs

@@ -1,7 +1,8 @@
+#![allow(deprecated)] // TODO: unified syntax
+
 use benchmark_common::ExampleStruct;
 use linked_list_repeat::ProxyTrait;
-use multiversx_sc::types::{MultiValueEncoded, TokenIdentifier};
-use multiversx_sc_scenario::{api::StaticApi, scenario_model::*, *};
+use multiversx_sc_scenario::imports::*;
 
 const WASM_PATH_EXPR: &str = "mxsc:output/linked-list-repeat.mxsc.json";
 

contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml

@@ -25,7 +25,7 @@ overflow-checks = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.48.1"
+version = "0.49.0-alpha.4"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]