From e4ff185c5f41386b8e32d4f51391df8eb3b2543f Mon Sep 17 00:00:00 2001 From: Ethan Frey Date: Fri, 24 Jul 2020 13:31:08 +0200 Subject: [PATCH 1/3] Rename cw1-multisig to cw1-whitelist --- Cargo.lock | 2 +- contracts/{cw1-multisig => cw1-whitelist}/.cargo/config | 0 contracts/{cw1-multisig => cw1-whitelist}/Cargo.toml | 4 ++-- contracts/{cw1-multisig => cw1-whitelist}/NOTICE | 0 contracts/{cw1-multisig => cw1-whitelist}/README.md | 7 ++++--- .../{cw1-multisig => cw1-whitelist}/examples/schema.rs | 0 .../schema/config_response.json | 0 .../schema/handle_msg_for__empty.json | 0 .../{cw1-multisig => cw1-whitelist}/schema/init_msg.json | 0 .../{cw1-multisig => cw1-whitelist}/schema/query_msg.json | 0 contracts/{cw1-multisig => cw1-whitelist}/src/contract.rs | 0 contracts/{cw1-multisig => cw1-whitelist}/src/lib.rs | 0 contracts/{cw1-multisig => cw1-whitelist}/src/msg.rs | 0 contracts/{cw1-multisig => cw1-whitelist}/src/state.rs | 0 14 files changed, 7 insertions(+), 6 deletions(-) rename contracts/{cw1-multisig => cw1-whitelist}/.cargo/config (100%) rename contracts/{cw1-multisig => cw1-whitelist}/Cargo.toml (85%) rename contracts/{cw1-multisig => cw1-whitelist}/NOTICE (100%) rename contracts/{cw1-multisig => cw1-whitelist}/README.md (90%) rename contracts/{cw1-multisig => cw1-whitelist}/examples/schema.rs (100%) rename contracts/{cw1-multisig => cw1-whitelist}/schema/config_response.json (100%) rename contracts/{cw1-multisig => cw1-whitelist}/schema/handle_msg_for__empty.json (100%) rename contracts/{cw1-multisig => cw1-whitelist}/schema/init_msg.json (100%) rename contracts/{cw1-multisig => cw1-whitelist}/schema/query_msg.json (100%) rename contracts/{cw1-multisig => cw1-whitelist}/src/contract.rs (100%) rename contracts/{cw1-multisig => cw1-whitelist}/src/lib.rs (100%) rename contracts/{cw1-multisig => cw1-whitelist}/src/msg.rs (100%) rename contracts/{cw1-multisig => cw1-whitelist}/src/state.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index fdc3e394c..745bbe5b2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -85,7 +85,7 @@ dependencies = [ ] [[package]] -name = "cw1-multisig" +name = "cw1-whitelist" version = "0.1.0" dependencies = [ "cosmwasm-schema", diff --git a/contracts/cw1-multisig/.cargo/config b/contracts/cw1-whitelist/.cargo/config similarity index 100% rename from contracts/cw1-multisig/.cargo/config rename to contracts/cw1-whitelist/.cargo/config diff --git a/contracts/cw1-multisig/Cargo.toml b/contracts/cw1-whitelist/Cargo.toml similarity index 85% rename from contracts/cw1-multisig/Cargo.toml rename to contracts/cw1-whitelist/Cargo.toml index 5c7624b22..fd45bb6b1 100644 --- a/contracts/cw1-multisig/Cargo.toml +++ b/contracts/cw1-whitelist/Cargo.toml @@ -1,9 +1,9 @@ [package] -name = "cw1-multisig" +name = "cw1-whitelist" version = "0.1.0" authors = ["Ethan Frey "] edition = "2018" -description = "Implementation of an proxy contract working as 1 of N multisig" +description = "Implementation of an proxy contract using a whitelist" license = "AGPL-3.0" [lib] diff --git a/contracts/cw1-multisig/NOTICE b/contracts/cw1-whitelist/NOTICE similarity index 100% rename from contracts/cw1-multisig/NOTICE rename to contracts/cw1-whitelist/NOTICE diff --git a/contracts/cw1-multisig/README.md b/contracts/cw1-whitelist/README.md similarity index 90% rename from contracts/cw1-multisig/README.md rename to contracts/cw1-whitelist/README.md index 29f170851..4fb452267 100644 --- a/contracts/cw1-multisig/README.md +++ b/contracts/cw1-whitelist/README.md @@ -1,6 +1,6 @@ -# CW1 Multisig +# CW1 Whitelist -This may be the simplest implementation of CW1, a "1 of N" multisig. +This may be the simplest implementation of CW1, a whitelist of addresses. It contains a set of admins that are defined upon creation. Any of those admins may `Execute` any message via the contract, per the CW1 spec. @@ -12,7 +12,8 @@ to be mutable or immutable. If it is mutable, then any admin may While largely an example contract for CW1, this has various real-world use-cases, such as a common account that is shared among multiple trusted devices, or trading an entire account (used as 1 of 1 mutable). Most of the time, -this can be used as a framework to build your own, more advanced cw1 implementations. +this can be used as a framework to build your own, +more advanced cw1 implementations. ## Allowing Custom Messages diff --git a/contracts/cw1-multisig/examples/schema.rs b/contracts/cw1-whitelist/examples/schema.rs similarity index 100% rename from contracts/cw1-multisig/examples/schema.rs rename to contracts/cw1-whitelist/examples/schema.rs diff --git a/contracts/cw1-multisig/schema/config_response.json b/contracts/cw1-whitelist/schema/config_response.json similarity index 100% rename from contracts/cw1-multisig/schema/config_response.json rename to contracts/cw1-whitelist/schema/config_response.json diff --git a/contracts/cw1-multisig/schema/handle_msg_for__empty.json b/contracts/cw1-whitelist/schema/handle_msg_for__empty.json similarity index 100% rename from contracts/cw1-multisig/schema/handle_msg_for__empty.json rename to contracts/cw1-whitelist/schema/handle_msg_for__empty.json diff --git a/contracts/cw1-multisig/schema/init_msg.json b/contracts/cw1-whitelist/schema/init_msg.json similarity index 100% rename from contracts/cw1-multisig/schema/init_msg.json rename to contracts/cw1-whitelist/schema/init_msg.json diff --git a/contracts/cw1-multisig/schema/query_msg.json b/contracts/cw1-whitelist/schema/query_msg.json similarity index 100% rename from contracts/cw1-multisig/schema/query_msg.json rename to contracts/cw1-whitelist/schema/query_msg.json diff --git a/contracts/cw1-multisig/src/contract.rs b/contracts/cw1-whitelist/src/contract.rs similarity index 100% rename from contracts/cw1-multisig/src/contract.rs rename to contracts/cw1-whitelist/src/contract.rs diff --git a/contracts/cw1-multisig/src/lib.rs b/contracts/cw1-whitelist/src/lib.rs similarity index 100% rename from contracts/cw1-multisig/src/lib.rs rename to contracts/cw1-whitelist/src/lib.rs diff --git a/contracts/cw1-multisig/src/msg.rs b/contracts/cw1-whitelist/src/msg.rs similarity index 100% rename from contracts/cw1-multisig/src/msg.rs rename to contracts/cw1-whitelist/src/msg.rs diff --git a/contracts/cw1-multisig/src/state.rs b/contracts/cw1-whitelist/src/state.rs similarity index 100% rename from contracts/cw1-multisig/src/state.rs rename to contracts/cw1-whitelist/src/state.rs From 07d788e32e5e102ebcbc77523a73650e4d83aa54 Mon Sep 17 00:00:00 2001 From: Ethan Frey Date: Fri, 24 Jul 2020 13:32:02 +0200 Subject: [PATCH 2/3] Fix up missing import --- contracts/cw1-whitelist/examples/schema.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/cw1-whitelist/examples/schema.rs b/contracts/cw1-whitelist/examples/schema.rs index ba1837213..66b19130f 100644 --- a/contracts/cw1-whitelist/examples/schema.rs +++ b/contracts/cw1-whitelist/examples/schema.rs @@ -3,7 +3,7 @@ use std::fs::create_dir_all; use cosmwasm_schema::{export_schema, remove_schemas, schema_for}; -use cw1_multisig::msg::{ConfigResponse, HandleMsg, InitMsg, QueryMsg}; +use cw1_whitelist::msg::{ConfigResponse, HandleMsg, InitMsg, QueryMsg}; fn main() { let mut out_dir = current_dir().unwrap(); From 8d37e55c724be9214d6afc80b9d4d4e5e3267fe4 Mon Sep 17 00:00:00 2001 From: Ethan Frey Date: Fri, 24 Jul 2020 13:36:57 +0200 Subject: [PATCH 3/3] Update CI --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 30cb201ae..fc7c19123 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ workflows: version: 2 test: jobs: - - contract_cw1_multisig + - contract_cw1_whitelist - contract_cw20_base - contract_cw20_escrow - package_cw1 @@ -11,10 +11,10 @@ workflows: - lint jobs: - contract_cw1_multisig: + contract_cw1_whitelist: docker: - image: rust:1.44.0 - working_directory: ~/project/contracts/cw1-multisig + working_directory: ~/project/contracts/cw1-whitelist steps: - checkout: path: ~/project @@ -23,7 +23,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-cw1-multisig-rust:1.44.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-cw1-whitelist-rust:1.44.0-{{ checksum "~/project/Cargo.lock" }} - run: name: Add wasm32 target command: rustup target add wasm32-unknown-unknown @@ -50,7 +50,7 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-cw1-multisig-rust:1.44.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-cw1-whitelist-rust:1.44.0-{{ checksum "~/project/Cargo.lock" }} contract_cw20_base: docker: