Merge pull request #250 from public-awesome/serkan/associated-address…

…-validation-update Enable name association for 1/1 collections with no admin
public-awesome · Sep 21, 2023 · c25419d · c25419d
2 parents aa6d1e0 + 2df8580
commit c25419d
Show file tree

Hide file tree

Showing 8 changed files with 268 additions and 38 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -21,7 +21,7 @@ workflows:
 jobs:
   contract_marketplace:
     docker:
-      - image: rust:1.64.0
+      - image: rust:1.65.0
     working_directory: ~/project/contracts/marketplace
     steps:
       - checkout:
@@ -31,7 +31,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-marketplace-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-marketplace-rust:1.65.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Unit Tests
           environment:
@@ -53,11 +53,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-marketplace-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-marketplace-rust:1.65.0-{{ checksum "~/project/Cargo.lock" }}
 
   contract_name-minter:
     docker:
-      - image: rust:1.64.0
+      - image: rust:1.65.0
     working_directory: ~/project/contracts/name-minter
     steps:
       - checkout:
@@ -67,7 +67,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-name-minter-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-name-minter-rust:1.65.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Unit Tests
           environment:
@@ -89,11 +89,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-name-minter-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-name-minter-rust:1.65.0-{{ checksum "~/project/Cargo.lock" }}
 
   contract_sg721-name:
     docker:
-      - image: rust:1.64.0
+      - image: rust:1.65.0
     working_directory: ~/project/contracts/sg721-name
     steps:
       - checkout:
@@ -103,7 +103,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-sg721-name-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-sg721-name-rust:1.65.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Unit Tests
           environment:
@@ -125,11 +125,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-sg721-name-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-sg721-name-rust:1.65.0-{{ checksum "~/project/Cargo.lock" }}
 
   package_sg-name:
     docker:
-      - image: rust:1.64.0
+      - image: rust:1.65.0
     working_directory: ~/project/package/sg-name
     steps:
       - checkout:
@@ -139,7 +139,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-sg-name-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-sg-name-rust:1.65.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Unit Tests
           environment:
@@ -149,19 +149,19 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-sg-name-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-sg-name-rust:1.65.0-{{ checksum "~/project/Cargo.lock" }}
 
   lint:
     docker:
-      - image: rust:1.64.0
+      - image: rust:1.65.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.64.0-{{ checksum "Cargo.lock" }}
+            - cargocache-v2-lint-rust:1.65.0-{{ checksum "Cargo.lock" }}
       - run:
           name: Add rustfmt component
           command: rustup component add rustfmt
@@ -180,15 +180,15 @@ jobs:
             - target/debug/.fingerprint
             - target/debug/build
             - target/debug/deps
-          key: cargocache-v2-lint-rust:1.64.0-{{ checksum "Cargo.lock" }}
+          key: cargocache-v2-lint-rust:1.65.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.64.0
+      - image: rust:1.65.0
     steps:
       - checkout:
           path: ~/project
@@ -197,7 +197,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-wasm-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-wasm-rust:1.65.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Add wasm32 target
           command: rustup target add wasm32-unknown-unknown
@@ -217,7 +217,7 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-wasm-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-wasm-rust:1.65.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Check wasm contracts
           command: |

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    = "1.2.5"
+version    = "1.2.6"
 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": "1.2.3",
+  "contract_version": "1.2.6",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",

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": "1.2.3",
+  "contract_version": "1.2.6",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",