Merge pull request #169 from multiversx/feat/next

Beta Update

Cargo.toml

@@ -5,13 +5,10 @@ members = [
   "chain-factory",
   "chain-factory/meta",
   "esdt-safe",
+  "esdt-safe/interactor",
   "esdt-safe/meta",
   "fee-market",
   "fee-market/meta",
-  "pair-mock",
-  "pair-mock/meta",
-  "router-mock",
-  "router-mock/meta",
   "header-verifier",
   "header-verifier/meta", 
 ]

chain-config/Cargo.toml

@@ -12,10 +12,10 @@ path = "src/lib.rs"
 num-bigint = "0.4.2"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "=0.53.2"
+version = "=0.54.0"
 
 [dependencies.multiversx-sc]
-version = "=0.53.2"
+version = "=0.54.0"
 
 [dependencies.multiversx-sc-modules]
-version = "=0.53.2"
+version = "=0.54.0"

chain-config/meta/Cargo.toml

@@ -11,4 +11,4 @@ authors = ["you"]
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "=0.53.2"
+version = "=0.54.0"

chain-config/wasm/Cargo.toml

@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "=0.53.2"
+version = "=0.54.0"
 
 [workspace]
 members = ["."]

chain-factory/Cargo.toml

@@ -12,10 +12,10 @@ path = "src/lib.rs"
 num-bigint = "0.4.2"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "=0.53.2"
+version = "=0.54.0"
 
 [dependencies.multiversx-sc]
-version = "=0.53.2"
+version = "=0.54.0"
 
 [dependencies.utils]
 path = "../common/utils"

chain-factory/meta/Cargo.toml

@@ -11,4 +11,4 @@ authors = ["you"]
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "=0.53.2"
+version = "=0.54.0"

chain-factory/wasm/Cargo.toml

@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "=0.53.2"
+version = "=0.54.0"
 
 [workspace]
 members = ["."]

common/bls-signature/Cargo.toml

@@ -5,10 +5,10 @@ authors = ["dorin-iancu <[email protected]>"]
 edition = "2018"
 
 [dependencies.multiversx-sc]
-version = "=0.53.2"
+version = "=0.54.0"
 
 [dependencies.transaction]
 path = "../transaction"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "=0.53.2"
+version = "=0.54.0"

common/max-bridged-amount-module/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["dorin-iancu <[email protected]>"]
 edition = "2018"
 
 [dependencies.multiversx-sc]
-version = "=0.53.2"
+version = "=0.54.0"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "=0.53.2"
+version = "=0.54.0"

common/setup-phase/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["dorin-iancu <[email protected]>"]
 edition = "2018"
 
 [dependencies.multiversx-sc]
-version = "=0.53.2"
+version = "=0.54.0"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "=0.53.2"
+version = "=0.54.0"

common/token-whitelist/Cargo.toml

@@ -14,7 +14,7 @@ path = "../setup-phase"
 path = "../utils"
 
 [dependencies.multiversx-sc]
-version = "=0.53.2"
+version = "=0.54.0"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "=0.53.2"
+version = "=0.54.0"

common/token-whitelist/src/lib.rs

@@ -1,7 +1,5 @@
 #![no_std]
 
-use bls_signature::BlsSignature;
-
 multiversx_sc::imports!();
 
 #[multiversx_sc::module]
@@ -10,37 +8,27 @@ pub trait TokenWhitelistModule:
 {
     /// Tokens in the whitelist can be transferred without fees
     #[endpoint(addTokensToWhitelist)]
-    fn add_tokens_to_whitelist(
-        &self,
-        opt_signature: Option<BlsSignature<Self::Api>>,
-        tokens: MultiValueEncoded<TokenIdentifier>,
-    ) {
+    fn add_tokens_to_whitelist(&self, tokens: MultiValueEncoded<TokenIdentifier>) {
         if !self.is_setup_phase_complete() {
             self.require_caller_initiator();
             self.token_whitelist().extend(tokens);
 
             return;
         }
 
-        let token_list = self.verify_items_signature(opt_signature, tokens);
-        self.token_whitelist().extend(&token_list);
+        self.token_whitelist().extend(tokens);
     }
 
     #[endpoint(removeTokensFromWhitelist)]
-    fn remove_tokens_from_whitelist(
-        &self,
-        opt_signature: Option<BlsSignature<Self::Api>>,
-        tokens: MultiValueEncoded<TokenIdentifier>,
-    ) {
+    fn remove_tokens_from_whitelist(&self, tokens: MultiValueEncoded<TokenIdentifier>) {
         if !self.is_setup_phase_complete() {
             self.require_caller_initiator();
             self.remove_items(&mut self.token_whitelist(), tokens);
 
             return;
         }
 
-        let token_list = self.verify_items_signature(opt_signature, tokens);
-        self.remove_items(&mut self.token_whitelist(), &token_list);
+        self.remove_items(&mut self.token_whitelist(), tokens);
     }
 
     fn require_token_not_blacklisted(&self, token_id: &TokenIdentifier) {
@@ -52,37 +40,27 @@ pub trait TokenWhitelistModule:
 
     /// Tokens in blacklist cannot be transferred
     #[endpoint(addTokensToBlacklist)]
-    fn add_tokens_to_blacklist(
-        &self,
-        opt_signature: Option<BlsSignature<Self::Api>>,
-        tokens: MultiValueEncoded<TokenIdentifier>,
-    ) {
+    fn add_tokens_to_blacklist(&self, tokens: MultiValueEncoded<TokenIdentifier>) {
         if !self.is_setup_phase_complete() {
             self.require_caller_initiator();
             self.token_blacklist().extend(tokens);
 
             return;
         }
 
-        let token_list = self.verify_items_signature(opt_signature, tokens);
-        self.token_blacklist().extend(&token_list);
+        self.token_blacklist().extend(tokens);
     }
 
     #[endpoint(removeTokensFromBlacklist)]
-    fn remove_tokens_from_blacklist(
-        &self,
-        opt_signature: Option<BlsSignature<Self::Api>>,
-        tokens: MultiValueEncoded<TokenIdentifier>,
-    ) {
+    fn remove_tokens_from_blacklist(&self, tokens: MultiValueEncoded<TokenIdentifier>) {
         if !self.is_setup_phase_complete() {
             self.require_caller_initiator();
             self.remove_items(&mut self.token_blacklist(), tokens);
 
             return;
         }
 
-        let token_list = self.verify_items_signature(opt_signature, tokens);
-        self.remove_items(&mut self.token_blacklist(), &token_list);
+        self.remove_items(&mut self.token_blacklist(), tokens);
     }
 
     #[view(getTokenWhitelist)]

common/transaction/Cargo.toml

@@ -8,4 +8,4 @@ edition = "2018"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.53.2"
+version = "=0.54.0"