Merge branch 'main' of github.com:neutron-org/neutron-dev-contracts i…

…nto feat/refactor-icq-module-documentation
neutron-org · Oct 31, 2024 · 08f2c54 · 08f2c54
2 parents 9016bd1 + f81c62d
commit 08f2c54
Show file tree

Hide file tree

Showing 79 changed files with 1,185 additions and 4,365 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,9 +2,7 @@
 members = [
     "contracts/balance-tracker",
     "contracts/before-send-hook",
-    "contracts/client_updater",
     "contracts/cron",
-    "contracts/dex",
     "contracts/dex_grpc",
     "contracts/echo",
     "contracts/grpc_querier",
@@ -34,7 +32,8 @@ overflow-checks = true
 
 [workspace.dependencies]
 neutron-sdk = { package = "neutron-sdk", git = "https://github.com/neutron-org/neutron-sdk", branch = "main" }
-neutron-std = { git = "https://github.com/neutron-org/neutron-std", branch = "feat/clean-bindings" }
+neutron-std = { git = "https://github.com/neutron-org/neutron-std", branch = "main" }
+
 prost = "0.12.4"
 prost-types = "0.12.4"
 cosmos-sdk-proto = { version = "0.20.0", default-features = false }

diff --git a/contracts/balance-tracker/.cargo/config b/contracts/balance-tracker/.cargo/config
@@ -3,4 +3,3 @@ 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 tokenfactory_tracker_schema"
diff --git a/contracts/client_updater/.cargo/config b/contracts/client_updater/.cargo/config
diff --git a/contracts/client_updater/Cargo.toml b/contracts/client_updater/Cargo.toml
diff --git a/contracts/client_updater/README.md b/contracts/client_updater/README.md
diff --git a/contracts/client_updater/examples/client_updater-schema.rs b/contracts/client_updater/examples/client_updater-schema.rs
diff --git a/contracts/client_updater/schema/execute_msg.json b/contracts/client_updater/schema/execute_msg.json
diff --git a/contracts/client_updater/schema/instantiate_msg.json b/contracts/client_updater/schema/instantiate_msg.json
diff --git a/contracts/client_updater/src/contract.rs b/contracts/client_updater/src/contract.rs
diff --git a/contracts/client_updater/src/lib.rs b/contracts/client_updater/src/lib.rs
diff --git a/contracts/client_updater/updater.sh b/contracts/client_updater/updater.sh
diff --git a/contracts/dex/.cargo/config → contracts/cron/.cargo/config b/contracts/dex/.cargo/config → contracts/cron/.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 --example schema"
diff --git a/contracts/cron/src/contract.rs b/contracts/cron/src/contract.rs
@@ -1,5 +1,5 @@
 use crate::msg::{ExecuteMsg, InstantiateMsg, QueryMsg};
-use crate::state::{BEGIN_BLOCKER_SHEDULES, END_BLOCKER_SHEDULES};
+use crate::state::{BEGIN_BLOCKER_SCHEDULES, END_BLOCKER_SCHEDULES};
 use cosmwasm_std::{
     entry_point, to_json_binary, Binary, Deps, DepsMut, Env, MessageInfo, Response, StdError,
     StdResult,
@@ -34,24 +34,24 @@ pub fn execute(deps: DepsMut, _: Env, info: MessageInfo, msg: ExecuteMsg) -> Std
 
     match msg {
         ExecuteMsg::AddBeginBlockerSchedule { name } => {
-            let counter = BEGIN_BLOCKER_SHEDULES
+            let counter = BEGIN_BLOCKER_SCHEDULES
                 .may_load(deps.storage, name.clone())?
                 .unwrap_or_default()
                 .checked_add(1)
                 .unwrap_or_default();
 
-            BEGIN_BLOCKER_SHEDULES.save(deps.storage, name, &counter)?;
+            BEGIN_BLOCKER_SCHEDULES.save(deps.storage, name, &counter)?;
 
             Ok(Response::default())
         }
         ExecuteMsg::AddEndBlockerSchedule { name } => {
-            let counter = END_BLOCKER_SHEDULES
+            let counter = END_BLOCKER_SCHEDULES
                 .may_load(deps.storage, name.clone())?
                 .unwrap_or_default()
                 .checked_add(1)
                 .unwrap_or_default();
 
-            END_BLOCKER_SHEDULES.save(deps.storage, name, &counter)?;
+            END_BLOCKER_SCHEDULES.save(deps.storage, name, &counter)?;
 
             Ok(Response::default())
         }
@@ -62,11 +62,11 @@ pub fn execute(deps: DepsMut, _: Env, info: MessageInfo, msg: ExecuteMsg) -> Std
 pub fn query(deps: Deps, _: Env, msg: QueryMsg) -> StdResult<Binary> {
     match msg {
         QueryMsg::GetBeginBlockerScheduleCounter { name } => {
-            let res = BEGIN_BLOCKER_SHEDULES.may_load(deps.storage, name)?;
+            let res = BEGIN_BLOCKER_SCHEDULES.may_load(deps.storage, name)?;
             to_json_binary(&res)
         }
         QueryMsg::GetEndBlockerScheduleCounter { name } => {
-            let res = END_BLOCKER_SHEDULES.may_load(deps.storage, name)?;
+            let res = END_BLOCKER_SCHEDULES.may_load(deps.storage, name)?;
             to_json_binary(&res)
         }
     }

diff --git a/contracts/cron/src/state.rs b/contracts/cron/src/state.rs
@@ -1,4 +1,4 @@
 use cw_storage_plus::Map;
 
-pub const BEGIN_BLOCKER_SHEDULES: Map<String, u64> = Map::new("begin_blocker_shedules");
-pub const END_BLOCKER_SHEDULES: Map<String, u64> = Map::new("end_blocker_shedules");
+pub const BEGIN_BLOCKER_SCHEDULES: Map<String, u64> = Map::new("begin_blocker_shedules");
+pub const END_BLOCKER_SCHEDULES: Map<String, u64> = Map::new("end_blocker_shedules");