Merge remote-tracking branch 'origin/main' into feat/tx-with-SC-call

# Conflicts: # bridged-tokens-wrapper/Cargo.toml # bridged-tokens-wrapper/meta/Cargo.toml # bridged-tokens-wrapper/wasm/Cargo.lock # bridged-tokens-wrapper/wasm/Cargo.toml # bridged-tokens-wrapper/wasm/src/lib.rs # common/eth-address/Cargo.toml # common/fee-estimator-module/Cargo.toml # common/max-bridged-amount-module/Cargo.toml # common/token-module/Cargo.toml # common/transaction/Cargo.toml # common/tx-batch-module/Cargo.toml # esdt-safe/Cargo.toml # esdt-safe/meta/Cargo.toml # esdt-safe/wasm/Cargo.toml # esdt-safe/wasm/src/lib.rs # multi-transfer-esdt/Cargo.toml # multi-transfer-esdt/meta/Cargo.toml # multi-transfer-esdt/wasm/Cargo.lock # multi-transfer-esdt/wasm/Cargo.toml # multi-transfer-esdt/wasm/src/lib.rs # multisig/Cargo.toml # multisig/meta/Cargo.toml # multisig/wasm/Cargo.lock # multisig/wasm/Cargo.toml # multisig/wasm/src/lib.rs
multiversx · Dec 27, 2023 · 41522c5 · 41522c5
2 parents b10b80c + 8c1438e
commit 41522c5
Show file tree

Hide file tree

Showing 29 changed files with 317 additions and 173 deletions.
diff --git a/bridged-tokens-wrapper/Cargo.toml b/bridged-tokens-wrapper/Cargo.toml
@@ -7,13 +7,15 @@ publish = false
 
 [lib]
 path = "src/lib.rs"
+
 [dependencies.transaction]
 path = "../common/transaction"
 
 [dependencies.multiversx-sc]
-version = "0.42.0"
+version = "0.45.2"
 
 [dependencies.multiversx-sc-modules]
-version = "0.42.0"
+version = "0.45.2"
+
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.42.0"
+version = "0.45.2"
diff --git a/bridged-tokens-wrapper/meta/Cargo.toml b/bridged-tokens-wrapper/meta/Cargo.toml
@@ -3,8 +3,10 @@ name = "bridged-tokens-wrapper-meta"
 version = "0.0.0"
 edition = "2018"
 publish = false
+
 [dependencies.bridged-tokens-wrapper]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.42.0"
+version = "0.45.2"
+default-features = false
diff --git a/bridged-tokens-wrapper/src/lib.rs b/bridged-tokens-wrapper/src/lib.rs
@@ -18,6 +18,9 @@ pub trait BridgedTokensWrapper: multiversx_sc_modules::pause::PauseModule {
         self.set_paused(true);
     }
 
+    #[upgrade]
+    fn upgrade(&self) {}
+
     #[only_owner]
     #[endpoint(addWrappedToken)]
     fn add_wrapped_token(&self, universal_bridged_token_ids: TokenIdentifier, num_decimals: u32) {

diff --git a/bridged-tokens-wrapper/wasm/Cargo.lock b/bridged-tokens-wrapper/wasm/Cargo.lock
diff --git a/bridged-tokens-wrapper/wasm/Cargo.toml b/bridged-tokens-wrapper/wasm/Cargo.toml
@@ -1,23 +1,31 @@
+# Code generated by the multiversx-sc build system. DO NOT EDIT.
+
+# ##########################################
+# ############## AUTO-GENERATED #############
+# ##########################################
+
 [package]
 name = "bridged-tokens-wrapper-wasm"
 version = "0.0.0"
-authors = ["Alin Cruceat <[email protected]>"]
 edition = "2018"
 publish = false
 
 [lib]
 crate-type = ["cdylib"]
+
 [profile.release]
 codegen-units = 1
 opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+overflow-checks = false
+
 [dependencies.bridged-tokens-wrapper]
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.42.0"
+version = "0.45.2"
 
 [workspace]
 members = ["."]
diff --git a/bridged-tokens-wrapper/wasm/src/lib.rs b/bridged-tokens-wrapper/wasm/src/lib.rs
@@ -1,15 +1,18 @@
-// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
+// Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 ////////////////////////////////////////////////////
 ////////////////// AUTO-GENERATED //////////////////
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                           16
+// Endpoints:                           17
 // Async Callback (empty):               1
-// Total number of exported functions:  18
+// Total number of exported functions:  19
 
 #![no_std]
+
+// Configuration that works with rustc < 1.73.0.
+// TODO: Recommended rustc version: 1.73.0 or newer.
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
@@ -19,6 +22,7 @@ multiversx_sc_wasm_adapter::endpoints! {
     bridged_tokens_wrapper
     (
         init => init
+        upgrade => upgrade
         addWrappedToken => add_wrapped_token
         updateWrappedToken => update_wrapped_token
         removeWrappedToken => remove_wrapped_token

diff --git a/common/eth-address/Cargo.toml b/common/eth-address/Cargo.toml
@@ -6,5 +6,6 @@ edition = "2018"
 
 [lib]
 path = "src/lib.rs"
+
 [dependencies.multiversx-sc]
-version = "0.42.0"
+version = "0.45.2"
diff --git a/common/fee-estimator-module/Cargo.toml b/common/fee-estimator-module/Cargo.toml
@@ -3,7 +3,9 @@ name = "fee-estimator-module"
 version = "0.0.0"
 authors = ["dorin-iancu <[email protected]>"]
 edition = "2018"
+
 [dependencies.multiversx-sc]
-version = "0.42.0"
+version = "0.45.2"
+
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.42.0"
+version = "0.45.2"
diff --git a/common/max-bridged-amount-module/Cargo.toml b/common/max-bridged-amount-module/Cargo.toml
@@ -3,7 +3,9 @@ name = "max-bridged-amount-module"
 version = "0.0.0"
 authors = ["dorin-iancu <[email protected]>"]
 edition = "2018"
+
 [dependencies.multiversx-sc]
-version = "0.42.0"
+version = "0.45.2"
+
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.42.0"
+version = "0.45.2"
diff --git a/common/token-module/Cargo.toml b/common/token-module/Cargo.toml
@@ -3,10 +3,12 @@ name = "token-module"
 version = "0.0.0"
 authors = ["dorin-iancu <[email protected]>"]
 edition = "2018"
+
 [dependencies.fee-estimator-module]
 path = "../fee-estimator-module"
 
 [dependencies.multiversx-sc]
-version = "0.42.0"
+version = "0.45.2"
+
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.42.0"
+version = "0.45.2"
diff --git a/common/transaction/Cargo.toml b/common/transaction/Cargo.toml
@@ -6,8 +6,9 @@ edition = "2018"
 
 [lib]
 path = "src/lib.rs"
+
 [dependencies.eth-address]
 path = "../eth-address"
 
 [dependencies.multiversx-sc]
-version = "0.42.0"
+version = "0.45.2"