Contract admin can pause/resume trades and cancel offers/listings

.circleci/config.yml

@@ -19,7 +19,7 @@ workflows:
 jobs:
   contract_marketplace:
     docker:
-      - image: rust:1.81.0
+      - image: rust:1.88.0
     working_directory: ~/project/contracts/marketplace
     steps:
       - checkout:
@@ -29,7 +29,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-marketplace-rust:1.81.0-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-marketplace-rust:1.88.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Unit Tests
           environment:
@@ -43,10 +43,10 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-marketplace-rust:1.81.0-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-marketplace-rust:1.88.0-{{ checksum "~/project/Cargo.lock" }}
   contract_marketplace_v2:
     docker:
-      - image: rust:1.81.0
+      - image: rust:1.88.0
     working_directory: ~/project/contracts/stargaze-marketplace-v2
     steps:
       - checkout:
@@ -56,7 +56,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-marketplace-v2-rust:1.81.0-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-marketplace-v2-rust:1.88.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Unit Tests
           environment:
@@ -70,18 +70,18 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-marketplace-v2-rust:1.81.0-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-marketplace-v2-rust:1.88.0-{{ checksum "~/project/Cargo.lock" }}
   lint:
     docker:
-      - image: rust:1.81.0
+      - image: rust:1.88.0
     steps:
       - checkout
       - run:
           name: Version information
           command: rustc --version; cargo --version; rustup --version; rustup target list --installed
       - restore_cache:
           keys:
-            - cargocache-v2-lint-rust:1.81.0-{{ checksum "Cargo.lock" }}
+            - cargocache-v2-lint-rust:1.88.0-{{ checksum "Cargo.lock" }}
       - run:
           name: Add rustfmt component
           command: rustup component add rustfmt
@@ -100,15 +100,15 @@ jobs:
             - target/debug/.fingerprint
             - target/debug/build
             - target/debug/deps
-          key: cargocache-v2-lint-rust:1.81.0-{{ checksum "Cargo.lock" }}
+          key: cargocache-v2-lint-rust:1.88.0-{{ checksum "Cargo.lock" }}
 
   # This runs one time on the top level to ensure all contracts compile properly into wasm.
   # We don't run the wasm build per contract build, and then reuse a lot of the same dependencies, so this speeds up CI time
   # for all the other tests.
   # We also sanity-check the resultant wasm files.
   wasm-build:
     docker:
-      - image: rust:1.81.0
+      - image: rust:1.88.0
     steps:
       - checkout:
           path: ~/project
@@ -117,7 +117,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-wasm-rust:1.81.0-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-wasm-rust:1.88.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Add wasm32 target
           command: rustup target add wasm32-unknown-unknown
@@ -137,7 +137,7 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-wasm-rust:1.81.0-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-wasm-rust:1.88.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Check wasm contracts
           command: |

contracts/marketplace/src/sudo.rs

@@ -137,7 +137,7 @@ pub fn sudo_update_params(
 
 pub fn sudo_add_operator(deps: DepsMut, operator: Addr) -> Result<Response, ContractError> {
     let mut params = SUDO_PARAMS.load(deps.storage)?;
-    if !params.operators.iter().any(|o| o == operator) {
+    if !params.operators.contains(&operator) {
         params.operators.push(operator.clone());
     } else {
         return Err(ContractError::OperatorAlreadyRegistered {});

contracts/marketplace/src/testing/helpers/funds.rs

@@ -22,7 +22,7 @@ pub fn add_funds_for_incremental_fee(
                 amount: fee_funds,
             }
         }))
-        .map_err(|err| println!("{:?}", err))
+        .map_err(|err| println!("{err:?}"))
         .ok();
     Ok(())
 }

contracts/marketplace/src/testing/helpers/nft_functions.rs

@@ -41,7 +41,7 @@ pub fn mint_for(
         &mint_for_creator_msg,
         &[],
     );
-    println!("res is {:?}", res);
+    println!("res is {res:?}");
     assert!(res.is_ok());
 }
 

contracts/marketplace/src/testing/setup/setup_accounts.rs

@@ -25,7 +25,7 @@ pub fn setup_accounts(router: &mut StargazeApp) -> Result<(Addr, Addr, Addr), Co
                 amount: funds.clone(),
             }
         }))
-        .map_err(|err| println!("{:?}", err))
+        .map_err(|err| println!("{err:?}"))
         .ok();
     router
         .sudo(SudoMsg::Bank({
@@ -34,7 +34,7 @@ pub fn setup_accounts(router: &mut StargazeApp) -> Result<(Addr, Addr, Addr), Co
                 amount: funds.clone(),
             }
         }))
-        .map_err(|err| println!("{:?}", err))
+        .map_err(|err| println!("{err:?}"))
         .ok();
     router
         .sudo(SudoMsg::Bank({
@@ -43,7 +43,7 @@ pub fn setup_accounts(router: &mut StargazeApp) -> Result<(Addr, Addr, Addr), Co
                 amount: creator_funds.clone(),
             }
         }))
-        .map_err(|err| println!("{:?}", err))
+        .map_err(|err| println!("{err:?}"))
         .ok();
 
     // Check native balances
@@ -67,7 +67,7 @@ pub fn setup_second_bidder_account(router: &mut StargazeApp) -> Result<Addr, Con
                 amount: funds.clone(),
             }
         }))
-        .map_err(|err| println!("{:?}", err))
+        .map_err(|err| println!("{err:?}"))
         .ok();
 
     // Check native balances

contracts/marketplace/src/testing/tests/bids.rs

@@ -276,7 +276,7 @@ fn auto_accept_bid() {
                 amount: coins(1000, "random"),
             }
         }))
-        .map_err(|err| println!("{:?}", err))
+        .map_err(|err| println!("{err:?}"))
         .ok();
     let set_bid_msg = ExecuteMsg::SetBid {
         sale_type: SaleType::FixedPrice,
@@ -899,7 +899,7 @@ fn try_set_accept_bid_high_fees() {
                 amount: creator_funds,
             }
         }))
-        .map_err(|err| println!("{:?}", err))
+        .map_err(|err| println!("{err:?}"))
         .ok();
     // Mint NFT for creator
     mint(&mut router, &creator, &minter_addr);
@@ -1096,7 +1096,7 @@ fn try_query_sorted_bids() {
                 amount: funds,
             }
         }))
-        .map_err(|err| println!("{:?}", err))
+        .map_err(|err| println!("{err:?}"))
         .ok();
 
     // Bidder makes bid

contracts/reserve-auction/src/tests/setup/setup_accounts.rs

@@ -24,7 +24,7 @@ pub fn setup_accounts(router: &mut StargazeApp) -> Result<(Addr, Addr, Addr), Co
                 amount: funds.clone(),
             }
         }))
-        .map_err(|err| println!("{:?}", err))
+        .map_err(|err| println!("{err:?}"))
         .ok();
     router
         .sudo(SudoMsg::Bank({
@@ -33,7 +33,7 @@ pub fn setup_accounts(router: &mut StargazeApp) -> Result<(Addr, Addr, Addr), Co
                 amount: funds.clone(),
             }
         }))
-        .map_err(|err| println!("{:?}", err))
+        .map_err(|err| println!("{err:?}"))
         .ok();
     router
         .sudo(SudoMsg::Bank({
@@ -42,7 +42,7 @@ pub fn setup_accounts(router: &mut StargazeApp) -> Result<(Addr, Addr, Addr), Co
                 amount: creator_funds.clone(),
             }
         }))
-        .map_err(|err| println!("{:?}", err))
+        .map_err(|err| println!("{err:?}"))
         .ok();
 
     // Check native balances
@@ -70,7 +70,7 @@ pub fn setup_addtl_account(
                 amount: funds.clone(),
             }
         }))
-        .map_err(|err| println!("{:?}", err))
+        .map_err(|err| println!("{err:?}"))
         .ok();
 
     // Check native balances

contracts/stargaze-marketplace-v2/src/error.rs

@@ -26,6 +26,9 @@ pub enum ContractError {
     #[error("InsufficientFunds")]
     InsufficientFunds,
 
+    #[error("ContractPaused")]
+    ContractPaused,
+
     #[error("InternalError: {0}")]
     InternalError(String),
 }