Refactoring

.gitignore

@@ -16,5 +16,5 @@ target/
 .cargo-ok
 
 artifacts
-packages/*/bin
-contracts/*/bin
+packages/*/schema
+contracts/*/schema

Cargo.toml

@@ -21,14 +21,18 @@ incremental = false
 codegen-units = 1
 incremental = false
 
-[profile.release.package.cw1-whitelist-ng]
-codegen-units = 1
-incremental = false
-
 [profile.release.package.cw3-fixed-multisig]
 codegen-units = 1
 incremental = false
 
 [profile.release.package.cw3-flex-multisig]
 codegen-units = 1
-incremental = false
+incremental = false
+
+[profile.release]
+rpath = false
+lto = true
+overflow-checks = true
+opt-level = 3
+debug = false
+debug-assertions = false

contracts/cw1-whitelist/.cargo/config

@@ -3,4 +3,4 @@ wasm = "build --release --target wasm32-unknown-unknown"
 wasm-debug = "build --target wasm32-unknown-unknown"
 unit-test = "test --lib"
 integration-test = "test --test integration"
-schema = "run --example schema"
+schema = "run --bin schema"

contracts/cw3-fixed-multisig/.cargo/config

@@ -3,4 +3,4 @@ wasm = "build --release --target wasm32-unknown-unknown"
 wasm-debug = "build --target wasm32-unknown-unknown"
 unit-test = "test --lib"
 integration-test = "test --test integration"
-schema = "run --example schema"
+schema = "run --bin schema"

contracts/cw3-flex-multisig/.cargo/config

@@ -3,4 +3,4 @@ wasm = "build --release --target wasm32-unknown-unknown"
 wasm-debug = "build --target wasm32-unknown-unknown"
 unit-test = "test --lib"
 integration-test = "test --test integration"
-schema = "run --example schema"
+schema = "run --bin schema"

contracts/ibc-reflect-send/.cargo/config

@@ -3,4 +3,4 @@ wasm = "build --release --target wasm32-unknown-unknown"
 wasm-debug = "build --target wasm32-unknown-unknown"
 unit-test = "test --lib"
 integration-test = "test --test integration"
-schema = "run --example schema"
+schema = "run --bin schema"

contracts/ibc-reflect-send/src/bin/schema.rs

@@ -0,0 +1,26 @@
+use std::env::current_dir;
+use std::fs::create_dir_all;
+
+use cosmwasm_schema::{export_schema, remove_schemas, schema_for};
+
+use cyber_std::CyberMsgWrapper;
+use ibc_reflect_send::ibc_msg::PacketMsg;
+use ibc_reflect_send::msg::{
+    AccountResponse, AdminResponse, ExecuteMsg, InstantiateMsg, ListAccountsResponse, QueryMsg,
+};
+
+fn main() {
+    let mut out_dir = current_dir().unwrap();
+    out_dir.push("schema");
+    create_dir_all(&out_dir).unwrap();
+    remove_schemas(&out_dir).unwrap();
+
+    export_schema(&schema_for!(CyberMsgWrapper), &out_dir);
+    export_schema(&schema_for!(ExecuteMsg), &out_dir);
+    export_schema(&schema_for!(InstantiateMsg), &out_dir);
+    export_schema(&schema_for!(QueryMsg), &out_dir);
+    export_schema(&schema_for!(PacketMsg), &out_dir);
+    export_schema(&schema_for!(AdminResponse), &out_dir);
+    export_schema(&schema_for!(AccountResponse), &out_dir);
+    export_schema(&schema_for!(ListAccountsResponse), &out_dir);
+}

contracts/ibc-reflect/.cargo/config

@@ -3,4 +3,4 @@ wasm = "build --release --target wasm32-unknown-unknown"
 wasm-debug = "build --target wasm32-unknown-unknown"
 unit-test = "test --lib"
 integration-test = "test --test integration"
-schema = "run --example schema"
+schema = "run --bin schema"

contracts/ibc-reflect/Cargo.toml

@@ -20,13 +20,13 @@ cranelift = ["cosmwasm-vm/cranelift"]
 backtraces = ["cosmwasm-std/backtraces", "cosmwasm-vm/backtraces"]
 
 [dependencies]
-cosmwasm-std = { version = "1.0.0-beta", features = ["iterator", "staking", "stargate"] }
-cosmwasm-storage = { version = "1.0.0-beta", features = ["iterator"] }
+cosmwasm-schema = { version = "1.0.0" }
+cosmwasm-std = { version = "1.0.0", features = ["iterator", "staking", "stargate"] }
+cosmwasm-storage = { version = "1.0.0", features = ["iterator"] }
 schemars = "0.8.1"
 serde = { version = "1.0.125", default-features = false, features = ["derive"] }
-cyber-std = { path = "../../packages/cyber-std"}
+cyber-std = { version = "0.2.2" }
 
 [dev-dependencies]
-cosmwasm-vm = { version = "1.0.0-beta", default-features = false, features = ["iterator", "stargate"] }
-cosmwasm-schema = { version = "1.0.0-beta" }
+cosmwasm-vm = { version = "1.0.0", default-features = false, features = ["iterator", "stargate"] }
 cw-multi-test = { version = "0.14.0" }

contracts/ibc-reflect/src/bin/schema.rs

@@ -0,0 +1,37 @@
+use std::env::current_dir;
+use std::fs::create_dir_all;
+
+use cosmwasm_schema::{export_schema, export_schema_with_title, remove_schemas, schema_for};
+
+use ibc_reflect::msg::{
+    AcknowledgementMsg, BalancesResponse, DispatchResponse, InstantiateMsg, PacketMsg, QueryMsg,
+    WhoAmIResponse,
+};
+use cyber_std::CyberMsgWrapper;
+
+fn main() {
+    let mut out_dir = current_dir().unwrap();
+    out_dir.push("schema");
+    create_dir_all(&out_dir).unwrap();
+    remove_schemas(&out_dir).unwrap();
+
+    export_schema(&schema_for!(CyberMsgWrapper), &out_dir);
+    export_schema(&schema_for!(InstantiateMsg), &out_dir);
+    export_schema(&schema_for!(QueryMsg), &out_dir);
+    export_schema(&schema_for!(PacketMsg), &out_dir);
+    export_schema_with_title(
+        &schema_for!(AcknowledgementMsg<BalancesResponse>),
+        &out_dir,
+        "AcknowledgementMsgBalances",
+    );
+    export_schema_with_title(
+        &schema_for!(AcknowledgementMsg<DispatchResponse>),
+        &out_dir,
+        "AcknowledgementMsgDispatch",
+    );
+    export_schema_with_title(
+        &schema_for!(AcknowledgementMsg<WhoAmIResponse>),
+        &out_dir,
+        "AcknowledgementMsgWhoAmI",
+    );
+}

contracts/reflect/.cargo/config

@@ -3,4 +3,4 @@ wasm = "build --release --target wasm32-unknown-unknown"
 wasm-debug = "build --target wasm32-unknown-unknown"
 unit-test = "test --lib"
 integration-test = "test --test integration"
-schema = "run --example schema"
+schema = "run --bin schema"

contracts/reflect/src/bin/schema.rs

@@ -0,0 +1,34 @@
+use std::env::current_dir;
+use std::fs::create_dir_all;
+
+use cosmwasm_schema::{export_schema, remove_schemas, schema_for};
+use cosmwasm_std::Response;
+
+use reflect::msg::{
+    ChainResponse, ExecuteMsg, InstantiateMsg, OwnerResponse,
+    QueryMsg, RawResponse,
+};
+use reflect::state::State;
+use cyber_std::CyberMsgWrapper;
+
+fn main() {
+    let mut out_dir = current_dir().unwrap();
+    out_dir.push("schema");
+    create_dir_all(&out_dir).unwrap();
+    remove_schemas(&out_dir).unwrap();
+
+    // messages
+    export_schema(&schema_for!(CyberMsgWrapper), &out_dir);
+    export_schema(&schema_for!(InstantiateMsg), &out_dir);
+    export_schema(&schema_for!(ExecuteMsg), &out_dir);
+    export_schema(&schema_for!(Response<CyberMsgWrapper>), &out_dir);
+    export_schema(&schema_for!(QueryMsg), &out_dir);
+
+    // The possible return types for QueryMsg cases
+    export_schema(&schema_for!(OwnerResponse), &out_dir);
+    export_schema(&schema_for!(ChainResponse), &out_dir);
+    export_schema(&schema_for!(RawResponse), &out_dir);
+
+    // state
+    export_schema(&schema_for!(State), &out_dir);
+}

contracts/reflect/src/lib.rs

@@ -1,5 +1,5 @@
 pub mod contract;
-mod errors;
+pub mod errors;
 pub mod msg;
 pub mod state;
 

contracts/std-test/.cargo/config

@@ -3,4 +3,4 @@ wasm = "build --release --target wasm32-unknown-unknown"
 wasm-debug = "build --target wasm32-unknown-unknown"
 unit-test = "test --lib --features backtraces"
 integration-test = "test --test integration"
-schema = "run --example schema"
+schema = "run --bin schema"

packages/cyber-std/.cargo/config

@@ -2,4 +2,4 @@
 wasm = "build --release --target wasm32-unknown-unknown"
 wasm-debug = "build --target wasm32-unknown-unknown"
 unit-test = "test --lib --features backtraces"
-schema = "run --example schema"
+schema = "run --bin schema"