CW-1155 (and royalties extension)

.circleci/config.yml

@@ -3,11 +3,14 @@ workflows:
   version: 2
   test:
     jobs:
+      - contract_cw1155_base
+      - contract_cw1155_royalties
       - contract_cw721_base
       - contract_cw721_expiration
       - contract_cw721_fixed_price
       - contract_cw721_receiver_tester
       - package_cw721
+      - package_cw1155
       - lint
       - wasm-build
   deploy:
@@ -189,6 +192,115 @@ jobs:
             - target
           key: cargocache-v2-cw721:1.64.0-{{ checksum "~/project/Cargo.lock" }}
 
+  contract_cw1155_base:
+    docker:
+      - image: rust:1.78.0
+    working_directory: ~/project/contracts/cw1155-base
+    steps:
+      - checkout:
+          path: ~/project
+      - run:
+          name: Version information
+          command: rustc --version; cargo --version; rustup --version
+      - restore_cache:
+          keys:
+            - cargocache-cw1155-base-rust:1.78.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-cw1155-base-rust:1.78.0-{{ checksum "~/project/Cargo.lock" }}
+
+  contract_cw1155_royalties:
+    docker:
+      - image: rust:1.78.0
+    working_directory: ~/project/contracts/cw1155-royalties
+    steps:
+      - checkout:
+          path: ~/project
+      - run:
+          name: Version information
+          command: rustc --version; cargo --version; rustup --version
+      - restore_cache:
+          keys:
+            - cargocache-cw1155-royalties-rust:1.78.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-cw1155-royalties-rust:1.78.0-{{ checksum "~/project/Cargo.lock" }}
+
+  package_cw1155:
+    docker:
+      - image: rust:1.78.0
+    working_directory: ~/project/packages/cw1155
+    steps:
+      - checkout:
+          path: ~/project
+      - run:
+          name: Version information
+          command: rustc --version; cargo --version; rustup --version; rustup target list --installed
+      - restore_cache:
+          keys:
+            - cargocache-v2-cw1155:1.78.0-{{ checksum "~/project/Cargo.lock" }}
+      - run:
+          name: Build library for native target
+          command: cargo build --locked
+      - run:
+          name: Run unit tests
+          command: cargo test --locked
+      - run:
+          name: Build and run schema generator
+          command: cargo schema --locked
+      - run:
+          name: Ensure 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-v2-cw1155:1.78.0-{{ checksum "~/project/Cargo.lock" }}
+
   lint:
     docker:
       - image: rust:1.78.0

.gitignore

@@ -26,5 +26,5 @@ artifacts/
 # code coverage
 tarpaulin-report.*
 
-# raw json schema files
-**/raw/*.json
+# json schema files
+**/schema/**/*.json

Cargo.toml

@@ -25,6 +25,8 @@ cw721-base-016  = { git = "https://github.com/CosmWasm/cw-nfts", tag = "v0.16.0"
 cw721-metadata-onchain-016  = { git = "https://github.com/CosmWasm/cw-nfts", tag = "v0.16.0", package = "cw721-metadata-onchain" } # needed for testing legacy migration
 cw721-base-017  = { git = "https://github.com/CosmWasm/cw-nfts", tag = "v0.17.0", package = "cw721-base" } # needed for testing legacy migration
 cw721-base-018  = { git = "https://github.com/CosmWasm/cw-nfts", tag = "v0.18.0", package = "cw721-base" } # needed for testing legacy migration
+cw1155 = { path = "./packages/cw1155", version = "*" }
+cw1155-base = { path = "./contracts/cw1155-base", version = "*" }
 cw-multi-test   = { version = "^0.20", features = ["cosmwasm_1_2"] }
 cw-ownable      = { git = "https://github.com/public-awesome/cw-plus-plus.git", rev = "28c1a09bfc6b4f1942fefe3eb0b50faf9d3b1523"} # TODO: switch to official https://github.com/larry0x/cw-plus-plus once merged
 cw-paginate-storage = { version = "^2.4", git = "https://github.com/DA0-DA0/dao-contracts.git" }

Makefile.toml

@@ -6,19 +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]
 # https://hub.docker.com/r/cosmwasm/workspace-optimizer/tags https://hub.docker.com/r/cosmwasm/workspace-optimizer-arm64/tags
@@ -32,7 +32,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.16.0
+  ${image}:0.15.1
 """
 
 [tasks.schema]

contracts/cw1155-base/.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/cw1155-base/Cargo.toml

@@ -0,0 +1,38 @@
+[package]
+name = "cw1155-base"
+authors = ["shab <dirtyshab@protonmail.com>"]
+description = "Basic implementation cw1155"
+version       = { workspace = true }
+edition       = { workspace = true }
+license       = { workspace = true }
+repository    = { workspace = true }
+homepage      = { workspace = true }
+documentation = { workspace = true }
+
+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.
+  "artifacts/*",
+]
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[features]
+# for more explicit tests, cargo test --features=backtraces
+backtraces = ["cosmwasm-std/backtraces"]
+# use library feature to disable all instantiate/execute/query exports
+library = []
+
+[dependencies]
+cw-utils = { workspace = true }
+cw2 = { workspace = true }
+cw1155 = { workspace = true }
+cw721 = { workspace = true }
+cw721-base = { workspace = true, features = ["library"] }
+cw-ownable = { workspace = true }
+cw-storage-plus = { workspace = true }
+cosmwasm-std = { workspace = true }
+schemars = { workspace = true }
+serde = { workspace = true }
+cosmwasm-schema = { workspace = true }

contracts/cw1155-base/examples/schema.rs

@@ -0,0 +1,12 @@
+use cosmwasm_schema::write_api;
+use cw1155::msg::Cw1155InstantiateMsg;
+
+use cw1155_base::{Cw1155BaseExecuteMsg, Cw1155BaseQueryMsg};
+
+fn main() {
+    write_api! {
+        instantiate: Cw1155InstantiateMsg,
+        execute: Cw1155BaseExecuteMsg,
+        query: Cw1155BaseQueryMsg,
+    }
+}