Merge branch 'main' into merge-and-upgrade-2

multiversx · Jul 11, 2024 · 5194d5a · 5194d5a
2 parents 334161c + 385c1e9
commit 5194d5a
Show file tree

Hide file tree

Showing 311 changed files with 5,709 additions and 3,812 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/contracts/adder/Cargo.toml b/contracts/adder/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 path = "src/adder.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.4"
+version = "0.51.1"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.51.1"
diff --git a/contracts/adder/interact/Cargo.toml b/contracts/adder/interact/Cargo.toml
@@ -1,21 +1,27 @@
+[[bin]]
+name = "basic-interact"
+path = "src/basic_interact.rs"
+
 [package]
 name = "basic-interact"
 version = "0.0.0"
 authors = ["Ovidiu Stinga <[email protected]>"]
 edition = "2021"
 publish = false
 
-[[bin]]
-name = "basic-interact"
-path = "src/basic_interact.rs"
-
 [dependencies]
-clap = { version = "4.4.7", features = ["derive"] }
-serde = { version = "1.0", features = ["derive"] }
 toml = "0.8.6"
 
+[dependencies.clap]
+version = "4.4.7"
+features = ["derive"]
+
+[dependencies.serde]
+version = "1.0"
+features = ["derive"]
+
 [dependencies.adder]
 path = ".."
 
 [dependencies.multiversx-sc-snippets]
-version = "0.50.4"
+version = "0.51.1"
diff --git a/contracts/adder/interact/src/basic_interact.rs b/contracts/adder/interact/src/basic_interact.rs
@@ -21,20 +21,20 @@ async fn main() {
     match &cli.command {
         Some(basic_interact_cli::InteractCliCommand::Add(args)) => {
             basic_interact.add(args.value).await;
-        },
+        }
         Some(basic_interact_cli::InteractCliCommand::Deploy) => {
             basic_interact.deploy().await;
-        },
+        }
         Some(basic_interact_cli::InteractCliCommand::Feed) => {
             basic_interact.feed_contract_egld().await;
-        },
+        }
         Some(basic_interact_cli::InteractCliCommand::MultiDeploy(args)) => {
             basic_interact.multi_deploy(&args.count).await;
-        },
+        }
         Some(basic_interact_cli::InteractCliCommand::Sum) => {
             basic_interact.print_sum().await;
-        },
-        None => {},
+        }
+        None => {}
     }
 }
 

diff --git a/contracts/adder/meta/Cargo.toml b/contracts/adder/meta/Cargo.toml
@@ -7,6 +7,6 @@ publish = false
 [dependencies.adder]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
-version = "0.50.4"
+[dependencies.multiversx-sc-meta-lib]
+version = "0.51.1"
 default-features = false
diff --git a/contracts/adder/meta/src/main.rs b/contracts/adder/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<adder::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<adder::AbiProvider>();
 }
diff --git a/contracts/adder/wasm/Cargo.lock b/contracts/adder/wasm/Cargo.lock
diff --git a/contracts/adder/wasm/Cargo.toml b/contracts/adder/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.51.1"
 
 [workspace]
 members = ["."]
diff --git a/contracts/bonding-curve-contract/Cargo.toml b/contracts/bonding-curve-contract/Cargo.toml
@@ -9,10 +9,10 @@ publish = false
 path = "src/bonding_curve_contract.rs"
 
 [dependencies.multiversx-sc]
-version = "0.50.4"
+version = "0.51.1"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.4"
+version = "0.51.1"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.51.1"
diff --git a/contracts/bonding-curve-contract/meta/Cargo.toml b/contracts/bonding-curve-contract/meta/Cargo.toml
@@ -8,6 +8,6 @@ publish = false
 [dependencies.bonding-curve-contract]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
-version = "0.50.4"
+[dependencies.multiversx-sc-meta-lib]
+version = "0.51.1"
 default-features = false
diff --git a/contracts/bonding-curve-contract/meta/src/main.rs b/contracts/bonding-curve-contract/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<bonding_curve_contract::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<bonding_curve_contract::AbiProvider>();
 }
diff --git a/contracts/bonding-curve-contract/src/function_selector.rs b/contracts/bonding-curve-contract/src/function_selector.rs
@@ -5,9 +5,8 @@ use crate::bonding_curve::{
 use multiversx_sc::derive_imports::*;
 use multiversx_sc::imports::*;
 
-#[derive(
-    TopEncode, TopDecode, NestedEncode, NestedDecode, TypeAbi, PartialEq, Eq, Clone, Default,
-)]
+#[type_abi]
+#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, PartialEq, Eq, Clone, Default)]
 pub enum FunctionSelector<M: ManagedTypeApi> {
     Linear(LinearFunction<M>),
     CustomExample(BigUint<M>),

diff --git a/contracts/bonding-curve-contract/wasm/Cargo.lock b/contracts/bonding-curve-contract/wasm/Cargo.lock
diff --git a/contracts/bonding-curve-contract/wasm/Cargo.toml b/contracts/bonding-curve-contract/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.50.4"
+version = "0.51.1"
 
 [workspace]
 members = ["."]
diff --git a/contracts/check-pause/Cargo.toml b/contracts/check-pause/Cargo.toml
@@ -12,10 +12,10 @@ path = "src/check_pause.rs"
 num-bigint = "0.4.2"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.50.4"
+version = "0.51.1"
 
 [dependencies.multiversx-sc]
-version = "0.50.4"
+version = "0.51.1"
 
 [dependencies.multiversx-sc-modules]
-version = "0.50.4"
+version = "0.51.1"
diff --git a/contracts/check-pause/meta/Cargo.toml b/contracts/check-pause/meta/Cargo.toml
@@ -8,6 +8,6 @@ authors = ["Alin Cruceat <[email protected]>"]
 [dependencies.check-pause]
 path = ".."
 
-[dependencies.multiversx-sc-meta]
-version = "0.50.4"
+[dependencies.multiversx-sc-meta-lib]
+version = "0.51.1"
 default-features = false
diff --git a/contracts/check-pause/meta/src/main.rs b/contracts/check-pause/meta/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    multiversx_sc_meta::cli_main::<check_pause::AbiProvider>();
+    multiversx_sc_meta_lib::cli_main::<check_pause::AbiProvider>();
 }