Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: public-awesome/cw-nfts
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.17.0
Choose a base ref
...
head repository: public-awesome/cw-nfts
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.18.0
Choose a head ref
  • 19 commits
  • 16 files changed
  • 4 contributors

Commits on Feb 28, 2023

  1. v0.17 upgrade logic

    larry0x committed Feb 28, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    bf2f5f0 View commit details

Commits on Apr 1, 2023

  1. Copy the full SHA
    2a0906c View commit details
  2. Update workspace optimizer

    shanev committed Apr 1, 2023
    Copy the full SHA
    222be83 View commit details

Commits on Apr 2, 2023

  1. Copy the full SHA
    c4b8c11 View commit details

Commits on Apr 3, 2023

  1. Merge pull request #112 from CosmWasm/v0.17-upgrade

    v0.17 upgrade logic
    JakeHartnell authored Apr 3, 2023
    Copy the full SHA
    5179de0 View commit details
  2. Copy the full SHA
    7ed44da View commit details

Commits on Apr 22, 2023

  1. Make upgrade logics public

    larry0x authored Apr 22, 2023
    Copy the full SHA
    30a1d3b View commit details

Commits on Apr 24, 2023

  1. Copy the full SHA
    5eb754d View commit details

Commits on Apr 26, 2023

  1. Update schema json files

     - Renames start_from to start_after in json files.
    jinmel committed Apr 26, 2023
    Copy the full SHA
    40c6b83 View commit details
  2. Merge pull request #121 from jinmel/update_schema

    Update schema json files
    JakeHartnell authored Apr 26, 2023
    Copy the full SHA
    f8600e6 View commit details

Commits on Jun 19, 2023

  1. Copy the full SHA
    3a024ee View commit details
  2. Merge pull request #115 from CosmWasm/shanev/fix-ci

    Update workspace optimizer
    shanev authored Jun 19, 2023
    Copy the full SHA
    8ff3222 View commit details
  3. Update versions for release

    shanev committed Jun 19, 2023
    Copy the full SHA
    b3fa02f View commit details
  4. Update to v1.0.1

    shanev committed Jun 19, 2023
    Copy the full SHA
    052bc81 View commit details
  5. Change to 0.17.1

    shanev committed Jun 19, 2023
    Copy the full SHA
    ad46fb6 View commit details
  6. Change to 0.18.0

    shanev committed Jun 19, 2023
    Copy the full SHA
    15bfecd View commit details
  7. Updated schemas

    shanev committed Jun 19, 2023
    Copy the full SHA
    64527b3 View commit details

Commits on Jun 28, 2023

  1. Updated versions

    shanev committed Jun 28, 2023
    Copy the full SHA
    b680704 View commit details

Commits on Jun 29, 2023

  1. Merge pull request #126 from CosmWasm/shanev/release-0.18.0

    Publish release 0.18.0
    shanev authored Jun 29, 2023
    Copy the full SHA
    177a993 View commit details
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -261,7 +261,7 @@ jobs:
- run:
name: Build development contracts
command: |
docker run --volumes-from with_code cosmwasm/workspace-optimizer:0.12.9
docker run --volumes-from with_code cosmwasm/workspace-optimizer:0.12.13
docker cp with_code:/code/artifacts ./artifacts
- run:
name: Show data
81 changes: 41 additions & 40 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 17 additions & 17 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
members = ["packages/*", "contracts/*"]

[workspace.package]
version = "0.17.0"
version = "0.18.0"
edition = "2021"
license = "Apache-2.0"
repository = "https://github.com/CosmWasm/cw-nfts"
@@ -13,39 +13,39 @@ rust-version = "1.65"
[workspace.dependencies]
cosmwasm-schema = "1.2.1"
cosmwasm-std = "1.2.1"
cw2 = "1.0.1"
cw20 = "1.0.1"
cw721 = { version = "0.17.0", path = "./packages/cw721" }
cw721-base = { version = "0.17.0", path = "./contracts/cw721-base" }
cw2 = "1.1.0"
cw20 = "1.1.0"
cw721 = { version = "0.18.0", path = "./packages/cw721" }
cw721-base = { version = "0.18.0", path = "./contracts/cw721-base" }
cw721-base-016 = { version = "0.16.0", package = "cw721-base" }
cw-multi-test = "0.16.2"
cw-ownable = "0.5.0"
cw-storage-plus = "1.0.1"
cw-multi-test = "0.16.5"
cw-ownable = "0.5.1"
cw-storage-plus = "1.1.0"
cw-utils = "1.0.1"
schemars = "0.8.11"
serde = { version = "1.0.152", default-features = false, features = ["derive"] }
thiserror = "1.0.38"

[profile.release.package.cw721-base]
codegen-units = 1
incremental = false
incremental = false

[profile.release.package.cw721-metadata-onchain]
codegen-units = 1
incremental = false
incremental = false

[profile.release.package.cw721-fixed-price]
codegen-units = 1
incremental = false
incremental = false

[profile.release.package.cw721-non-transferable]
codegen-units = 1
incremental = false
incremental = false

[profile.release]
rpath = false
lto = true
overflow-checks = true
opt-level = 3
debug = false
rpath = false
lto = true
overflow-checks = true
opt-level = 3
debug = false
debug-assertions = false
15 changes: 5 additions & 10 deletions Makefile.toml
Original file line number Diff line number Diff line change
@@ -6,24 +6,19 @@ skip_core_tasks = true

[tasks.fmt]
command = "cargo"
args = ["fmt", "--all", "--check"]
args = ["fmt", "--all", "--check"]

[tasks.test]
command = "cargo"
args = ["test", "--locked"]
args = ["test", "--locked"]

[tasks.lint]
command = "cargo"
args = ["clippy", "--tests", "--", "-D", "warnings"]
args = ["clippy", "--tests", "--", "-D", "warnings"]

[tasks.build]
command = "cargo"
args = [
"build",
"--release",
"--locked",
"--target", "wasm32-unknown-unknown",
]
args = ["build", "--release", "--locked", "--target", "wasm32-unknown-unknown"]

[tasks.optimize]
script = """
@@ -36,7 +31,7 @@ fi
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 \
${image}:0.12.11
${image}:0.12.13
"""

[tasks.schema]
6 changes: 3 additions & 3 deletions contracts/cw2981-royalties/schema/cw2981-royalties.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"contract_name": "cw2981-royalties",
"contract_version": "0.17.0",
"contract_version": "0.18.0",
"idl_version": "1.0.0",
"instantiate": {
"$schema": "http://json-schema.org/draft-07/schema#",
@@ -1261,7 +1261,7 @@
],
"properties": {
"tokens": {
"description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_from` in future queries to achieve pagination.",
"description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_after` in future queries to achieve pagination.",
"type": "array",
"items": {
"type": "string"
@@ -1904,7 +1904,7 @@
],
"properties": {
"tokens": {
"description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_from` in future queries to achieve pagination.",
"description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_after` in future queries to achieve pagination.",
"type": "array",
"items": {
"type": "string"
6 changes: 3 additions & 3 deletions contracts/cw721-base/schema/cw721-base.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"contract_name": "cw721-base",
"contract_version": "0.17.0",
"contract_version": "0.18.0",
"idl_version": "1.0.0",
"instantiate": {
"$schema": "http://json-schema.org/draft-07/schema#",
@@ -1070,7 +1070,7 @@
],
"properties": {
"tokens": {
"description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_from` in future queries to achieve pagination.",
"description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_after` in future queries to achieve pagination.",
"type": "array",
"items": {
"type": "string"
@@ -1669,7 +1669,7 @@
],
"properties": {
"tokens": {
"description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_from` in future queries to achieve pagination.",
"description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_after` in future queries to achieve pagination.",
"type": "array",
"items": {
"type": "string"
6 changes: 3 additions & 3 deletions contracts/cw721-base/src/error.rs
Original file line number Diff line number Diff line change
@@ -10,6 +10,9 @@ pub enum ContractError {
#[error(transparent)]
Ownership(#[from] OwnershipError),

#[error(transparent)]
Version(#[from] cw2::VersionError),

#[error("token_id already claimed")]
Claimed {},

@@ -18,7 +21,4 @@ pub enum ContractError {

#[error("Approval not found for: {spender}")]
ApprovalNotFound { spender: String },

#[error("found version ({0}) while attempting to migrate from 0.16.0")]
WrongMigrateVersion(String),
}
Loading