support prefunding _before_ renewal window...note this has consequenc…

…es...
public-awesome · Oct 9, 2024 · 486e4f4 · 486e4f4
1 parent d91a67b
commit 486e4f4
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 20 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,7 @@ members  = ["packages/*", "contracts/*"]
 resolver = "2"
 
 [workspace.package]
-version    = "2.3.0"
+version    = "2.3.1"
 edition    = "2021"
 homepage   = "https://stargaze.zone"
 repository = "https://github.com/public-awesome/names"

diff --git a/contracts/marketplace/schema/name-marketplace.json b/contracts/marketplace/schema/name-marketplace.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "name-marketplace",
-  "contract_version": "2.3.0",
+  "contract_version": "2.3.1",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",

diff --git a/contracts/marketplace/src/query.rs b/contracts/marketplace/src/query.rs
@@ -206,9 +206,12 @@ pub fn query_ask_renew_price(
 
     let ask_renew_start_time = ask.renewal_time.seconds() - sudo_params.renew_window;
 
-    if current_time.seconds() < ask_renew_start_time {
-        return Ok((None, None));
-    }
+    // NOTE: disabling to support prefunding before renewal window
+    //       this may be re-enabled if the prefunding logic needs
+    //       to be supported again
+    // if current_time.seconds() < ask_renew_start_time {
+    //     return Ok((None, None));
+    // }
 
     let name_minter = NAME_MINTER.load(deps.storage)?;
     let name_minter_params = deps

diff --git a/contracts/name-minter/schema/name-minter.json b/contracts/name-minter/schema/name-minter.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "name-minter",
-  "contract_version": "2.3.0",
+  "contract_version": "2.3.1",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",

diff --git a/contracts/name-minter/src/integration_tests.rs b/contracts/name-minter/src/integration_tests.rs
@@ -1145,9 +1145,9 @@ mod query {
             },
         );
         assert!(result.is_ok());
-
-        let (renewal_price, _renewal_bid) = result.unwrap();
-        assert!(renewal_price.is_none());
+        // NOTE: disabling to support prefunding before renewal window
+        // let (renewal_price, _renewal_bid) = result.unwrap();
+        // assert!(renewal_price.is_none());
 
         update_block_time(&mut app, SECONDS_PER_YEAR - (60 * 60 * 24 * 30));
 

diff --git a/contracts/sg721-name/schema/sg721-name.json b/contracts/sg721-name/schema/sg721-name.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "sg721-name",
-  "contract_version": "2.3.0",
+  "contract_version": "2.3.1",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",