Merge main

.circleci/config.yml

@@ -5,6 +5,7 @@ workflows:
     jobs:
       - contract_cw721_base
       - contract_cw721_metadata_onchain
+      - contract_cw721_fixed_price
       - package_cw721
       - lint
       - wasm-build
@@ -92,6 +93,43 @@ jobs:
           key: cargocache-cw721-metadata-onchain-rust:1.53.0-{{ checksum "~/project/Cargo.lock" }}
 
 
+  contract_cw721_fixed_price:
+    docker:
+      - image: rust:1.53.0
+    working_directory: ~/project/contracts/cw721-fixed-price
+    steps:
+      - checkout:
+          path: ~/project
+      - run:
+          name: Version information
+          command: rustc --version; cargo --version; rustup --version
+      - restore_cache:
+          keys:
+            - cargocache-cw721-fixed-price-rust:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+      - run:
+          name: Unit Tests
+          environment:
+            RUST_BACKTRACE: 1
+          command: cargo unit-test --locked
+      - run:
+          name: Build and run schema generator
+          command: cargo schema --locked
+      - run:
+          name: Ensure checked-in schemas are up-to-date
+          command: |
+            CHANGES_IN_REPO=$(git status --porcelain)
+            if [[ -n "$CHANGES_IN_REPO" ]]; then
+              echo "Repository is dirty. Showing 'git status' and 'git --no-pager diff' for debugging now:"
+              git status && git --no-pager diff
+              exit 1
+            fi
+      - save_cache:
+          paths:
+            - /usr/local/cargo/registry
+            - target
+          key: cargocache-cw721-fixed-price-rust:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+
+
   package_cw721:
     docker:
       - image: rust:1.53.0

Cargo.toml

@@ -9,6 +9,10 @@ incremental = false
 codegen-units = 1
 incremental = false
 
+[profile.release.package.cw721-fixed-price]
+codegen-units = 1
+incremental = false
+
 [profile.release]
 rpath = false
 lto = true

contracts/cw721-fixed-price/.cargo/config

@@ -0,0 +1,5 @@
+[alias]
+wasm = "build --release --target wasm32-unknown-unknown"
+wasm-debug = "build --target wasm32-unknown-unknown"
+unit-test = "test --lib"
+schema = "run --example schema"

contracts/cw721-fixed-price/Cargo.toml

@@ -0,0 +1,56 @@
+[package]
+name = "cw721-fixed-price"
+version = "0.1.0"
+authors = ["Vernon Johnson <vtj2105@columbia.edu>"]
+edition = "2018"
+
+exclude = [
+  # Those files are rust-optimizer artifacts. You might want to commit them for convenience but they should not be part of the source code publication.
+  "contract.wasm",
+  "hash.txt",
+]
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[profile.release]
+opt-level = 3
+debug = false
+rpath = false
+lto = true
+debug-assertions = false
+codegen-units = 1
+panic = 'abort'
+incremental = false
+overflow-checks = true
+
+[features]
+# for more explicit tests, cargo test --features=backtraces
+backtraces = ["cosmwasm-std/backtraces"]
+# use library feature to disable all instantiate/execute/query exports
+library = []
+
+[package.metadata.scripts]
+optimize = """docker run --rm -v "$(pwd)":/code \
+  --mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \
+  --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
+  cosmwasm/rust-optimizer:0.12.4
+"""
+
+[dependencies]
+cosmwasm-std = { version = "1.0.0-beta" }
+cosmwasm-storage = { version = "1.0.0-beta" }
+cw-storage-plus = "0.11.1"
+cw2 = "0.11.1"
+schemars = "0.8.3"
+cw721-base = { path = "../cw721-base", version = "0.11.0", features = [ "library"] }
+cw20 = "0.11.1"
+serde = { version = "1.0.127", default-features = false, features = ["derive"] }
+thiserror = { version = "1.0.26" }
+cw-utils = { version= "0.11.1" }
+prost = "0.9.0"
+
+[dev-dependencies]
+cosmwasm-schema = { version = "1.0.0-beta" }

contracts/cw721-fixed-price/NOTICE

@@ -0,0 +1,13 @@
+Copyright 2021 Vernon Johnson <vtj2105@columbia.edu>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.