From e013ee3dca3db05fb260c0cf617a0abea1a1c993 Mon Sep 17 00:00:00 2001 From: array-in-a-matrix Date: Sat, 26 Mar 2022 17:14:35 -0400 Subject: [PATCH 1/5] ignore node modules --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3c3629e --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +node_modules From 4bba0e97763779ac7d747f58b9089fa1b63ac956 Mon Sep 17 00:00:00 2001 From: BiPhan4 Date: Sat, 26 Mar 2022 17:41:00 -0400 Subject: [PATCH 2/5] new changes --- contracts/counter/Cargo.lock | 62 ++++++++++++++++++++++------------ contracts/counter/src/msg.rs | 6 ++-- contracts/counter/src/state.rs | 13 ++++++- 3 files changed, 57 insertions(+), 24 deletions(-) diff --git a/contracts/counter/Cargo.lock b/contracts/counter/Cargo.lock index 5bd8cc9..8b9dd73 100644 --- a/contracts/counter/Cargo.lock +++ b/contracts/counter/Cargo.lock @@ -37,9 +37,9 @@ checksum = "44c32f031ea41b4291d695026c023b95d59db2d8a2c7640800ed56bc8f510f22" [[package]] name = "cosmwasm-crypto" -version = "0.16.0" +version = "0.16.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa1715a9b71c7c31385a3f021dee2fd0a17b82043ab937467e103aa25043d2e" +checksum = "aa6d40e8d484d04dd66e8d5795a3b36d9aaedda2cd75eeed2e00d56fd4923bdb" dependencies = [ "digest", "ed25519-zebra", @@ -50,9 +50,9 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "0.16.0" +version = "0.16.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f6e6dff07965015c4fcdf477c4becde738a2bfb40cf6239bdcea9335016c5a2" +checksum = "848c6ddf2e7dc61c2ebfce263307fce5f66a65ab30e22ac97bf431ed4c5da7f1" dependencies = [ "syn", ] @@ -69,13 +69,14 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "0.16.0" +version = "0.16.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92bdeee0ebba164ebbef9380522cc50f889db38acc1f1210f6b55ee2244b8c59" +checksum = "b8eeb09d759020f5793fa7f61bb107bf651cf355735b62845b686ab05b78e164" dependencies = [ "base64", "cosmwasm-crypto", "cosmwasm-derive", + "forward_ref", "schemars", "serde", "serde-json-wasm", @@ -93,6 +94,20 @@ dependencies = [ "serde", ] +[[package]] +name = "counter" +version = "0.1.0" +dependencies = [ + "cosmwasm-schema", + "cosmwasm-std", + "cosmwasm-storage", + "cw-storage-plus", + "cw2", + "schemars", + "serde", + "thiserror", +] + [[package]] name = "cpufeatures" version = "0.1.5" @@ -145,15 +160,27 @@ dependencies = [ [[package]] name = "cw-storage-plus" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ef70f7912bed72ff56a4f704aee279b6ef4cd0a5f3aa2732ad371e3f6d3ea71" +checksum = "c1e867b9972b83b32e00e878dfbff48299ba26618dabeb19b9c56fae176dc225" dependencies = [ "cosmwasm-std", "schemars", "serde", ] +[[package]] +name = "cw2" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d48454f96494aa1018556cd457977375cc8c57ef3e5c767cfa2ea5ec24b0258" +dependencies = [ + "cosmwasm-std", + "cw-storage-plus", + "schemars", + "serde", +] + [[package]] name = "der" version = "0.4.1" @@ -230,6 +257,12 @@ dependencies = [ "subtle", ] +[[package]] +name = "forward_ref" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8cbd1169bd7b4a0a20d92b9af7a7e0422888bd38a6f5ec29c1fd8c1558a272e" + [[package]] name = "generic-array" version = "0.14.4" @@ -338,19 +371,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "project-name" -version = "0.1.0" -dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "cosmwasm-storage", - "cw-storage-plus", - "schemars", - "serde", - "thiserror", -] - [[package]] name = "quote" version = "1.0.9" diff --git a/contracts/counter/src/msg.rs b/contracts/counter/src/msg.rs index 4cec36d..380c8a2 100644 --- a/contracts/counter/src/msg.rs +++ b/contracts/counter/src/msg.rs @@ -3,14 +3,16 @@ use serde::{Deserialize, Serialize}; #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)] pub struct InstantiateMsg { - pub count: i32, + pub count: i32, //what do we initialize? } #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)] #[serde(rename_all = "snake_case")] pub enum ExecuteMsg { Increment {}, - Reset { count: i32 }, + Reset { count: i32 }, + //we will get user address and names. Then divide bill. Then take money from users and put into our own contract. + // } #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)] diff --git a/contracts/counter/src/state.rs b/contracts/counter/src/state.rs index 1b426f9..ed34991 100644 --- a/contracts/counter/src/state.rs +++ b/contracts/counter/src/state.rs @@ -2,7 +2,7 @@ use schemars::JsonSchema; use serde::{Deserialize, Serialize}; use cosmwasm_std::Addr; -use cw_storage_plus::Item; +use cw_storage_plus::Item; //import map and figure out how to use it #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)] pub struct State { @@ -11,3 +11,14 @@ pub struct State { } pub const STATE: Item = Item::new("state"); + +/* +add states: + +1 - the bill(s) / item +2 - the customers /map +3 - Need to figure out a way to store money that we've taken from users. Third state is item again? + +1 - how to use map and item to store customers or any state +2 - how to display bill to user +*/ From 80f952f15a46d0b809352914b7d0eb40acaa67e2 Mon Sep 17 00:00:00 2001 From: Array in a Matrix Date: Sat, 26 Mar 2022 17:47:28 -0400 Subject: [PATCH 3/5] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 13102ef..a7fcddb 100644 --- a/README.md +++ b/README.md @@ -1 +1,3 @@ # DefiHackathon-2022 + +Hello From aef216b83932be5dbe3e8ad78bcb0e06b3796059 Mon Sep 17 00:00:00 2001 From: Array in a Matrix Date: Sat, 26 Mar 2022 17:48:33 -0400 Subject: [PATCH 4/5] added hello --- contracts/counter/src/state.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contracts/counter/src/state.rs b/contracts/counter/src/state.rs index ed34991..f37a2c9 100644 --- a/contracts/counter/src/state.rs +++ b/contracts/counter/src/state.rs @@ -21,4 +21,6 @@ add states: 1 - how to use map and item to store customers or any state 2 - how to display bill to user + +Hello */ From ce7f2fc6be104fe2a82f9d871d0c90e8f08e17a2 Mon Sep 17 00:00:00 2001 From: BiPhan4 Date: Sat, 26 Mar 2022 20:56:27 -0400 Subject: [PATCH 5/5] non working changes --- contracts/counter/src/contract.rs | 13 ++++++++++++- contracts/counter/src/msg.rs | 1 + contracts/counter/src/state.rs | 8 +++++++- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/contracts/counter/src/contract.rs b/contracts/counter/src/contract.rs index 4d0fa6b..4b9dd18 100644 --- a/contracts/counter/src/contract.rs +++ b/contracts/counter/src/contract.rs @@ -5,7 +5,7 @@ use cw2::set_contract_version; use crate::error::ContractError; use crate::msg::{CountResponse, ExecuteMsg, InstantiateMsg, QueryMsg}; -use crate::state::{State, STATE}; +use crate::state::{State, User, STATE, CUSTOMERS}; // version info for migration info const CONTRACT_NAME: &str = "crates.io:counter"; @@ -41,9 +41,20 @@ pub fn execute( match msg { ExecuteMsg::Increment {} => try_increment(deps), ExecuteMsg::Reset { count } => try_reset(deps, info, count), + //ExecuteMsg::EnterCustomer {} => try_enter_address(deps, info), } } +pub fn try_enter_address(deps: DepsMut, info: MessageInfo, entering_address: String) -> Result{ + + let entry_address = deps.api.addr_validate(&entering_address)?; + + //load and save with extra key argument + let empty = CUSTOMERS.may_load(deps.storage, &str.to_string()); + Ok(Response::new()) +} + + pub fn try_increment(deps: DepsMut) -> Result { STATE.update(deps.storage, |mut state| -> Result<_, ContractError> { state.count += 1; diff --git a/contracts/counter/src/msg.rs b/contracts/counter/src/msg.rs index 380c8a2..dc8875f 100644 --- a/contracts/counter/src/msg.rs +++ b/contracts/counter/src/msg.rs @@ -11,6 +11,7 @@ pub struct InstantiateMsg { pub enum ExecuteMsg { Increment {}, Reset { count: i32 }, + EnterCustomer { entering_address: String} //we will get user address and names. Then divide bill. Then take money from users and put into our own contract. // } diff --git a/contracts/counter/src/state.rs b/contracts/counter/src/state.rs index f37a2c9..1c4599f 100644 --- a/contracts/counter/src/state.rs +++ b/contracts/counter/src/state.rs @@ -2,7 +2,7 @@ use schemars::JsonSchema; use serde::{Deserialize, Serialize}; use cosmwasm_std::Addr; -use cw_storage_plus::Item; //import map and figure out how to use it +use cw_storage_plus::{Item, Map}; //import map and figure out how to use it #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)] pub struct State { @@ -10,8 +10,14 @@ pub struct State { pub owner: Addr, } +pub struct User { + pub name: String, + pub address: Addr, +} + pub const STATE: Item = Item::new("state"); +pub const CUSTOMERS: Map<&str, User> = Map::new("customers"); /* add states: