Merge pull request #20 from multiversx/new-audit-fixes

new audit fixes
multiversx · Dec 28, 2023 · 422cc78 · 422cc78
2 parents b642dd1 + 6e69c1a
commit 422cc78
Show file tree

Hide file tree

Showing 19 changed files with 506 additions and 217 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/common/common_structs/Cargo.toml b/common/common_structs/Cargo.toml
@@ -13,4 +13,4 @@ features = ["esdt-token-payment-legacy-decode"]
 
 [dependencies.mergeable]
 git = "https://github.com/multiversx/mx-exchange-sc"
-rev = "4be981b"
+rev = "1fb9a1d"
diff --git a/common/common_subscriber/src/common_subscriber.rs b/common/common_subscriber/src/common_subscriber.rs
@@ -32,6 +32,17 @@ pub trait CommonSubscriberModule {
         &self,
         args: MultiValueEncoded<MultiValue3<Option<TokenIdentifier>, BigUint, Epoch>>,
     ) {
+        let wegld_token_id = self.wegld_token_id().get();
+
+        for arg in args.clone() {
+            let (token_id_opt, _, _) = arg.into_tuple();
+            require!(token_id_opt.is_some(), "Invalid payment token");
+            require!(
+                token_id_opt.unwrap() == wegld_token_id,
+                "Payment token must be WEGLD"
+            );
+        }
+
         let mut proxy_instance = self.get_subscription_fee_sc_proxy_instance();
         let _: () = proxy_instance
             .register_service(args)
@@ -95,6 +106,9 @@ pub trait CommonSubscriberModule {
     #[storage_mapper("feesContractAddress")]
     fn fees_contract_address(&self) -> SingleValueMapper<ManagedAddress>;
 
+    #[storage_mapper("wegldTokenId")]
+    fn wegld_token_id(&self) -> SingleValueMapper<TokenIdentifier>;
+
     #[view(getUserFees)]
     #[storage_mapper("userFees")]
     fn user_fees(