NTRN-260 slinky bindings (market map & oracle)

contracts/before-send-hook/examples/schema.rs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use before_send_hook_test::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
+use before_send_hook_test::msg::{InstantiateMsg, MigrateMsg, QueryMsg};
 use cosmwasm_schema::{export_schema, remove_schemas, schema_for};
 use std::{env::current_dir, fs::create_dir_all};
 
@@ -23,7 +23,6 @@ fn main() {
     remove_schemas(&out_dir).unwrap();
 
     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!(MigrateMsg), &out_dir);
 }

contracts/before-send-hook/src/msg.rs

@@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize};
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 pub struct InstantiateMsg {}
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
 #[serde(rename_all = "snake_case")]
 pub enum ExecuteMsg {}
 

contracts/marketmap/.cargo/config

@@ -0,0 +1,6 @@
+[alias]
+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"

contracts/marketmap/Cargo.toml

@@ -0,0 +1,43 @@
+[package]
+name = "marketmap"
+version = "0.1.0"
+edition = "2021"
+
+
+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.
+  "contract.wasm",
+  "hash.txt",
+]
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[profile.release]
+opt-level = 3
+debug = false
+rpath = false
+lto = true
+debug-assertions = false
+codegen-units = 1
+panic = 'abort'
+incremental = false
+overflow-checks = true
+
+[features]
+# for quicker tests, cargo test --lib
+# for more explicit tests, cargo test --features=backtraces
+backtraces = ["cosmwasm-std/backtraces"]
+library = []
+
+[dependencies]
+cosmwasm-std = "1.3.1"
+cw2 = "1.1.0"
+schemars = "0.8.10"
+serde = { version = "1.0.180", default-features = false, features = ["derive"] }
+neutron-sdk = { git = "https://github.com/neutron-org/neutron-sdk.git", branch = "feat/slinky-bindings" }
+
+[dev-dependencies]
+cosmwasm-schema = { version = "1.3.1", default-features = false }

contracts/marketmap/README.md

@@ -0,0 +1,3 @@
+# MarketMap
+
+This contract is used for tests in the main neutron repository.

contracts/marketmap/examples/schema.rs

@@ -0,0 +1,30 @@
+// Copyright 2022 Neutron
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::env::current_dir;
+use std::fs::create_dir_all;
+
+use cosmwasm_schema::{export_schema, remove_schemas, schema_for};
+use marketmap::contract::InstantiateMsg;
+use neutron_sdk::bindings::marketmap::query::MarketMapQuery;
+
+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!(InstantiateMsg), &out_dir);
+    export_schema(&schema_for!(MarketMapQuery), &out_dir);
+}

contracts/before-send-hook/schema/execute_msg.json → contracts/marketmap/schema/instantiate_msg.json

@@ -1,6 +1,5 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "ExecuteMsg",
-  "type": "string",
-  "enum": []
+  "title": "InstantiateMsg",
+  "type": "object"
 }

contracts/marketmap/schema/marketmap_query.json

@@ -0,0 +1,43 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "MarketmapQuery",
+  "oneOf": [
+    {
+      "description": "Parameters queries the parameters of the module.",
+      "type": "object",
+      "required": [
+        "params"
+      ],
+      "properties": {
+        "params": {
+          "type": "object"
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "get_last_updated_request"
+      ],
+      "properties": {
+        "get_last_updated_request": {
+          "type": "object"
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "get_market_map_request"
+      ],
+      "properties": {
+        "get_market_map_request": {
+          "type": "object"
+        }
+      },
+      "additionalProperties": false
+    }
+  ]
+}

contracts/marketmap/src/contract.rs

@@ -0,0 +1,71 @@
+use cosmwasm_std::{
+    entry_point, to_json_binary, Binary, Deps, DepsMut, Env, MessageInfo, Response, StdResult,
+};
+use cw2::set_contract_version;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
+pub struct InstantiateMsg {}
+
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
+#[serde(rename_all = "snake_case")]
+pub enum ExecuteMsg {}
+
+use neutron_sdk::bindings::marketmap::query::MarketResponse;
+use neutron_sdk::bindings::{
+    marketmap::query::{LastUpdatedResponse, MarketMapQuery, MarketMapResponse, ParamsResponse},
+    msg::NeutronMsg,
+    query::NeutronQuery,
+};
+
+const CONTRACT_NAME: &str = concat!("crates.io:neutron-contracts__", env!("CARGO_PKG_NAME"));
+const CONTRACT_VERSION: &str = env!("CARGO_PKG_VERSION");
+
+#[entry_point]
+pub fn instantiate(
+    deps: DepsMut,
+    _env: Env,
+    _info: MessageInfo,
+    _msg: InstantiateMsg,
+) -> StdResult<Response> {
+    deps.api.debug("WASMDEBUG: instantiate");
+    set_contract_version(deps.storage, CONTRACT_NAME, CONTRACT_VERSION)?;
+    Ok(Response::default())
+}
+
+#[entry_point]
+pub fn execute(
+    _deps: DepsMut,
+    _env: Env,
+    _info: MessageInfo,
+    _msg: ExecuteMsg,
+) -> StdResult<Response<NeutronMsg>> {
+    Ok(Default::default())
+}
+
+#[entry_point]
+pub fn query(deps: Deps<NeutronQuery>, env: Env, msg: MarketMapQuery) -> StdResult<Binary> {
+    query_marketmap(deps, env, msg)
+}
+
+fn query_marketmap(deps: Deps<NeutronQuery>, _env: Env, msg: MarketMapQuery) -> StdResult<Binary> {
+    match msg {
+        MarketMapQuery::Params { .. } => {
+            let query_response: ParamsResponse = deps.querier.query(&msg.into())?;
+            to_json_binary(&query_response)
+        }
+        MarketMapQuery::LastUpdated { .. } => {
+            let query_response: LastUpdatedResponse = deps.querier.query(&msg.into())?;
+            to_json_binary(&query_response)
+        }
+        MarketMapQuery::MarketMap { .. } => {
+            let query_response: MarketMapResponse = deps.querier.query(&msg.into())?;
+            to_json_binary(&query_response)
+        }
+        MarketMapQuery::Market { .. } => {
+            let query_response: MarketResponse = deps.querier.query(&msg.into())?;
+            to_json_binary(&query_response)
+        }
+    }
+}

contracts/marketmap/src/lib.rs

@@ -0,0 +1 @@
+pub mod contract;

contracts/oracle/.cargo/config

@@ -0,0 +1,6 @@
+[alias]
+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"

contracts/oracle/Cargo.toml

@@ -0,0 +1,43 @@
+[package]
+name = "oracle"
+version = "0.1.0"
+edition = "2021"
+
+
+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.
+  "contract.wasm",
+  "hash.txt",
+]
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[profile.release]
+opt-level = 3
+debug = false
+rpath = false
+lto = true
+debug-assertions = false
+codegen-units = 1
+panic = 'abort'
+incremental = false
+overflow-checks = true
+
+[features]
+# for quicker tests, cargo test --lib
+# for more explicit tests, cargo test --features=backtraces
+backtraces = ["cosmwasm-std/backtraces"]
+library = []
+
+[dependencies]
+cosmwasm-std = "1.3.1"
+cw2 = "1.1.0"
+schemars = "0.8.10"
+serde = { version = "1.0.180", default-features = false, features = ["derive"] }
+neutron-sdk = { git = "https://github.com/neutron-org/neutron-sdk.git", branch = "feat/slinky-bindings" }
+
+[dev-dependencies]
+cosmwasm-schema = { version = "1.3.1", default-features = false }

contracts/oracle/README.md

@@ -0,0 +1,3 @@
+# Oracle
+
+This contract is used for tests in the main neutron repository.

contracts/oracle/examples/schema.rs

@@ -0,0 +1,30 @@
+// Copyright 2022 Neutron
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::env::current_dir;
+use std::fs::create_dir_all;
+
+use cosmwasm_schema::{export_schema, remove_schemas, schema_for};
+use neutron_sdk::bindings::oracle::query::OracleQuery;
+use oracle::contract::InstantiateMsg;
+
+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!(InstantiateMsg), &out_dir);
+    export_schema(&schema_for!(OracleQuery), &out_dir);
+}

contracts/oracle/schema/instantiate_msg.json

@@ -0,0 +1,5 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "InstantiateMsg",
+  "type": "object"
+}