archway-network · gachouchani1999 · Jun 29, 2022 · Jun 29, 2022 · Jun 29, 2022 · Jul 1, 2022
diff --git a/.github/scripts/test_generate.sh b/.github/scripts/test_generate.sh
@@ -10,15 +10,15 @@ cd "$TMP_DIR"
 
 function test-template() {
   TEMPLATE="${1}"
-  PROJECT_NAME="${TEMPLATE//\//-}"
+  PROJECT_NAME="${TEMPLATE//\//-}-$RANDOM"
+
   echo "#######################################"
   echo "# Testing template $TEMPLATE"
   echo "#######################################"
-  (
-    GIT_BRANCH=$(git -C "$REPO_ROOT" branch --show-current)
 
-    echo "Generating project from local repository (branch $GIT_BRANCH) ..."
-    cargo generate --git "$REPO_ROOT" --name "$PROJECT_NAME" --branch "$GIT_BRANCH" "$TEMPLATE"
+  (
+    echo "Generating project from local repository..."
+    cargo generate --path "$REPO_ROOT" --name "$PROJECT_NAME" "$TEMPLATE"
 
     (
       cd "$PROJECT_NAME"
@@ -37,7 +37,6 @@ function test-template() {
       cargo unit-test
       echo "Creating schema ..."
       cargo schema
-
       echo "Building wasm ..."
       cargo wasm
     )

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -1,4 +1,4 @@
-on: [push]
+on: [push, pull_request]
 
 name: Check Templates
 
@@ -16,6 +16,8 @@ jobs:
           target: wasm32-unknown-unknown
           override: true
           profile: minimal
+          components: clippy
+
 
       - name: Install cargo-generate
         uses: actions-rs/cargo@v1

diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,5 @@ Cargo.lock
 
 # These are backup files generated by rustfmt
 **/*.rs.bk
+
+.idea
diff --git a/README.md b/README.md
@@ -5,7 +5,10 @@ Archway Smart Contract template projects used by the [Archway Developer CLI](htt
 ## List of templates
 
 - [Default](./default): a blank slate project
-- [Increment](./increment): a simple smart contract that increments and resets a counter
+- [Increment](./increment): a simple smart contrct that increments and resets a counter
+- [CW20-base](./cw20/base): the base smart contract for the CW20 Fungible Tokens standard
+- [CW20-escrow](./cw20/escrow): a smart contract representing an escrow for depositing and withdrawing CW20 tokens.
+- [CW721-on-chain-metdata](./cw721/on-chain-metadata/): the CW721 standard smart contract with an extension to store NFT metadata on chain.
 
 ## Creating a new project from a template
 

diff --git a/cw20/base/.cargo/config b/cw20/base/.cargo/config
@@ -3,3 +3,4 @@ wasm = "build --release --target wasm32-unknown-unknown"
 wasm-debug = "build --target wasm32-unknown-unknown"
 unit-test = "test --lib"
 schema = "run --example schema"
+
diff --git a/cw20/base/.genignore b/cw20/base/.genignore
diff --git a/cw20/base/.github/workflows/Basic.yml b/cw20/base/.github/workflows/Basic.yml
@@ -16,10 +16,10 @@ jobs:
       - name: Install stable toolchain
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: stable
+          profile: minimal
+          toolchain: 1.58.1
           target: wasm32-unknown-unknown
           override: true
-          profile: minimal
 
       - name: Run unit tests
         uses: actions-rs/cargo@v1
@@ -37,6 +37,8 @@ jobs:
         env:
           RUSTFLAGS: "-C link-arg=-s"
 
+
+
   lints:
     name: Lints
     runs-on: ubuntu-latest
@@ -47,9 +49,9 @@ jobs:
       - name: Install stable toolchain
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: stable
-          override: true
           profile: minimal
+          toolchain: 1.58.1
+          override: true
           components: rustfmt, clippy
 
       - name: Run cargo fmt
@@ -64,13 +66,13 @@ jobs:
           command: clippy
           args: -- -D warnings
 
-      - name: Generate schema
+      - name: Generate Schema
         uses: actions-rs/cargo@v1
         with:
           command: schema
           args: --locked
 
-      - name: Verify schema
+      - name: Verify Schema
         uses: tj-actions/verify-changed-files@v8
         id: verify-schema
         with:
@@ -81,3 +83,7 @@ jobs:
         run: |
           echo "The schema files are not in sync with the repository. Please, run 'cargo schema' to generate them again and commit the changes."
           exit 1
+
+      - name: Schema Changes
+        # fails if any changes not committed
+        run: git diff --exit-code schema
diff --git a/cw20/base/.gitignore b/cw20/base/.gitignore
@@ -1,16 +1,12 @@
-# Build results
-/target
+# Generated by Cargo
+# will have compiled files and executables
+/target/
 /artifacts
+# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
+# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
+Cargo.lock
 
-# Cargo+Git helper file (https://github.com/rust-lang/cargo/blob/0.44.1/src/cargo/sources/git/utils.rs#L320-L327)
-.cargo-ok
-
-# Text file backups
+# These are backup files generated by rustfmt
 **/*.rs.bk
 
-# macOS
-.DS_Store
-
-# IDEs
-*.iml
-.idea
+.idea
diff --git a/cw20/base/Cargo.toml b/cw20/base/Cargo.toml
@@ -6,7 +6,9 @@ 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.
-  "artifacts/*",
+  "contract.wasm",
+  "hash.txt",
+  "artifacts/*"
 ]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -33,22 +35,22 @@ library = []
 
 [package.metadata.scripts]
 optimize = """docker run --rm -v "$(pwd)":/code \
-  -e CARGO_TERM_COLOR=always \
   --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.5
+  cosmwasm/rust-optimizer:0.12.6
 """
 
 [dependencies]
-cosmwasm-std = "1.0.0-beta"
-cosmwasm-storage = "1.0.0-beta"
-cw-storage-plus = "0.12"
-cw0 = "0.10"
-cw2 = "0.12"
-cw20 = "0.12"
-schemars = "0.8"
-serde = { version = "1.0", default-features = false, features = ["derive"] }
-thiserror = "1.0"
+cosmwasm-std = "1.0.0"
+cosmwasm-storage = "1.0.0"
+cw-storage-plus = "^0.13.0"
+cw2 = "^0.13.0"
+cw20 = "^0.13.0"
+cw20-base = { version = "^0.13.0", features = ["library"] }
+schemars = "0.8.8"
+serde = { version = "1.0.137", default-features = false, features = ["derive"] }
+thiserror = { version = "1.0.31" }
 
 [dev-dependencies]
-cosmwasm-schema = "1.0.0-beta"
+cosmwasm-schema = "1.0.0"
+cw-multi-test = "0.13.2"
diff --git a/cw20/base/Developing.md b/cw20/base/Developing.md
@@ -3,12 +3,12 @@
 If you have recently created a contract with this template, you probably could use some
 help on how to build and test the contract, as well as prepare it for production. This
 file attempts to provide a brief overview, assuming you have installed a recent
-version of Rust already (eg. 1.51.0+).
+version of Rust already (eg. 1.58.1+).
 
 ## Prerequisites
 
 Before starting, make sure you have [rustup](https://rustup.rs/) along with a
-recent `rustc` and `cargo` version installed. Currently, we are testing on 1.51.0+.
+recent `rustc` and `cargo` version installed. Currently, we are testing on 1.58.1+.
 
 And you need to have the `wasm32-unknown-unknown` target installed as well.
 
@@ -74,7 +74,15 @@ to run it is this:
 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.11.4
+  cosmwasm/rust-optimizer:0.12.4
+```
+
+Or, If you're on an arm64 machine, you should use a docker image built with arm64.
+```sh
+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-arm64:0.12.4
 ```
 
 We must mount the contract code to `/code`. You can use a absolute path instead

diff --git a/cw20/base/Publishing.md b/cw20/base/Publishing.md
@@ -50,7 +50,7 @@ multiple contracts and label it like `escrow-0.1.0`. Don't forget a
 ### Note on build results
 
 Build results like Wasm bytecode or expected hash don't need to be updated since
-the don't belong to the source publication. However, they are excluded from packaging
+they don't belong to the source publication. However, they are excluded from packaging
 in `Cargo.toml` which allows you to commit them to your git repository if you like.
 
 ```toml

diff --git a/cw20/base/examples/schema.rs b/cw20/base/examples/schema.rs
@@ -3,11 +3,7 @@ use std::fs::create_dir_all;
 
 use cosmwasm_schema::{export_schema, remove_schemas, schema_for};
 
-use cw20::{
-    AllAccountsResponse, AllAllowancesResponse, AllowanceResponse, BalanceResponse,
-    TokenInfoResponse,
-};
-use {{crate_name}}::msg::{ExecuteMsg, InstantiateMsg, QueryMsg};
+use {{crate_name}}::{ExecuteMsg, InstantiateMsg, QueryMsg};
 
 fn main() {
     let mut out_dir = current_dir().unwrap();
@@ -18,9 +14,4 @@ fn main() {
     export_schema(&schema_for!(InstantiateMsg), &out_dir);
     export_schema(&schema_for!(ExecuteMsg), &out_dir);
     export_schema(&schema_for!(QueryMsg), &out_dir);
-    export_schema(&schema_for!(AllowanceResponse), &out_dir);
-    export_schema(&schema_for!(BalanceResponse), &out_dir);
-    export_schema(&schema_for!(TokenInfoResponse), &out_dir);
-    export_schema(&schema_for!(AllAllowancesResponse), &out_dir);
-    export_schema(&schema_for!(AllAccountsResponse), &out_dir);
 }
diff --git a/cw20/base/meta/README.md b/cw20/base/meta/README.md
diff --git a/cw20/base/meta/appveyor.yml b/cw20/base/meta/appveyor.yml
diff --git a/cw20/base/meta/test_generate.sh b/cw20/base/meta/test_generate.sh
diff --git a/cw20/base/rustfmt.toml b/cw20/base/rustfmt.toml
@@ -12,4 +12,3 @@ tab_spaces = 4
 #struct_field_align_threshold = 20
 #struct_lit_single_line = true
 #report_todo = "Always"
-