Cosmos Treasury Contract

Cargo.toml

@@ -1,7 +1,7 @@
 [workspace]
 members = [
     "contracts/simple-counter",
-    "contracts/light-client",
+    "contracts/treasury",
     "interact",
     "colony-chain"
 ]

contracts/light-client/src/contract.rs → contracts/test-light-client-cross/src/contract.rs

@@ -5,7 +5,7 @@ use cw2::set_contract_version;
 use pdao_beacon_chain_common::message::DeliverableMessage;
 
 use crate::error::ContractError;
-use crate::msg::{ExecuteMsg, GetHeaderResponse, InstantiateMsg, QueryMsg};
+use crate::msg::{ExecuteMsg, GetHeaderResponse, CheckVerifyResponse, InstantiateMsg, QueryMsg};
 use crate::state::{State, STATE};
 use pdao_colony_contract_common::LightClient;
 
@@ -91,6 +91,11 @@ pub fn execute_verify(
 pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> StdResult<Binary> {
     match msg {
         QueryMsg::GetHeader {} => to_binary(&query_header(deps)?),
+        QueryMsg::CheckVerify {
+            message,
+            block_height,
+            proof,
+        } => to_binary(&query_verify(deps, _env, info, message, block_height, proof)?), 
     }
 }
 
@@ -100,3 +105,22 @@ fn query_header(deps: Deps) -> StdResult<GetHeaderResponse> {
         header: state.light_client.last_header,
     })
 }
+
+fn query_verify(deps: DepsMut,
+    _env: Env,
+    _info: MessageInfo,
+    message: DeliverableMessage,
+    block_height: u64,
+    proof: String,
+) -> Result<Response, ContractError> {
+    let state = STATE.load(deps.storage)?;
+
+    let is_verified: bool = false;
+    if state.light_client.verify_commitment(message, block_height, proof) {
+        is_verified = true;
+    }
+
+    OK(CheckVerifyResponse {
+        is_verified: is_verified,
+    })
+}

contracts/test-light-client-cross/src/msg.rs

@@ -0,0 +1,49 @@
+use pdao_beacon_chain_common::message::DeliverableMessage;
+use pdao_colony_contract_common::light_client::{BlockFinalizationProof, Header, MerkleProof};
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
+#[serde(rename_all = "snake_case")]
+pub struct InstantiateMsg {
+    pub header: Header,
+    pub chain_name: String,
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
+#[serde(rename_all = "snake_case")]
+pub enum ExecuteMsg {
+    Update {
+        header: Header,
+        proof: BlockFinalizationProof,
+    },
+    Verify {
+        message: DeliverableMessage,
+        block_height: u64,
+        proof: MerkleProof,
+    },
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
+#[serde(rename_all = "snake_case")]
+pub enum QueryMsg {
+    GetHeader {},
+    CheckVerify {
+        message: DeliverableMessage,
+        block_height: u64,
+        proof: MerkleProof,
+    },
+}
+
+// We define a custom struct for each query response
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
+#[serde(rename_all = "snake_case")]
+pub struct GetHeaderResponse {
+    pub header: Header,
+}
+
+#[derive(Serialize, Deserialize, Clone, PartialEq, JsonSchema, Debug)]
+#[serde(rename_all = "snake_case")]
+pub struct CheckVerifyResponse {
+   pub is_verified: bool,
+}

contracts/test-treasury-cross/.cargo/config

@@ -0,0 +1,3 @@
+[alias]
+wasm = "build --release --target wasm32-unknown-unknown"
+schema = "run --example schema"

contracts/test-treasury-cross/examples/schema.rs

@@ -0,0 +1,20 @@
+use std::env::current_dir;
+use std::fs::create_dir_all;
+
+use cosmwasm_schema::{export_schema, remove_schemas, schema_for};
+
+use pdao_cosmos_light_client::msg::{ExecuteMsg, GetHeaderResponse, InstantiateMsg, QueryMsg};
+use pdao_cosmos_light_client::state::State;
+
+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!(ExecuteMsg), &out_dir);
+    export_schema(&schema_for!(QueryMsg), &out_dir);
+    export_schema(&schema_for!(State), &out_dir);
+    export_schema(&schema_for!(GetHeaderResponse), &out_dir);
+}

contracts/test-treasury-cross/schema/execute_msg.json

@@ -0,0 +1,39 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "ExecuteMsg",
+  "anyOf": [
+    {
+      "type": "object",
+      "required": [
+        "increment"
+      ],
+      "properties": {
+        "increment": {
+          "type": "object"
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "reset"
+      ],
+      "properties": {
+        "reset": {
+          "type": "object",
+          "required": [
+            "count"
+          ],
+          "properties": {
+            "count": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        }
+      },
+      "additionalProperties": false
+    }
+  ]
+}

contracts/test-treasury-cross/schema/get_count_response.json

@@ -0,0 +1,14 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "GetCountResponse",
+  "type": "object",
+  "required": [
+    "count"
+  ],
+  "properties": {
+    "count": {
+      "type": "integer",
+      "format": "int32"
+    }
+  }
+}

contracts/test-treasury-cross/schema/instantiate_msg.json

@@ -0,0 +1,14 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "InstantiateMsg",
+  "type": "object",
+  "required": [
+    "count"
+  ],
+  "properties": {
+    "count": {
+      "type": "integer",
+      "format": "int32"
+    }
+  }
+}

contracts/test-treasury-cross/schema/query_msg.json

@@ -0,0 +1,18 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "QueryMsg",
+  "anyOf": [
+    {
+      "type": "object",
+      "required": [
+        "get_count"
+      ],
+      "properties": {
+        "get_count": {
+          "type": "object"
+        }
+      },
+      "additionalProperties": false
+    }
+  ]
+}

contracts/test-treasury-cross/schema/state.json

@@ -0,0 +1,24 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "State",
+  "type": "object",
+  "required": [
+    "count",
+    "owner"
+  ],
+  "properties": {
+    "count": {
+      "type": "integer",
+      "format": "int32"
+    },
+    "owner": {
+      "$ref": "#/definitions/Addr"
+    }
+  },
+  "definitions": {
+    "Addr": {
+      "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+      "type": "string"
+    }
+  }
+}

contracts/test-treasury-cross/src/contract.rs

@@ -0,0 +1,116 @@
+#[cfg(not(feature = "library"))]
+use cosmwasm_std::entry_point;
+use cosmwasm_sts::{CosmosMsg, coins, BankMsg, WasmMsg, Uint128, BankQuery}
+use cosmwasm_std::{to_binary, Binary, Deps, DepsMut, Env, MessageInfo, Response, StdResult};
+use cw2::set_contract_version;
+use crate::error::ContractError;
+use crate::msg::{ExecuteMsg, QueryMsg, VerifyQueryMsg, VerifyResponse, BalanceResponse, BalanceAllResponse};
+
+const CONTRACT_NAME: &str = "crates.io:treasury";
+const CONTRACT_VERSION: &str = env!("CARGO_PKG_VERSION");
+const LIGHT_CLIENT_CONTRACT_ADDRESS = "emtpy"
+
+#[cfg_attr(not(feature="library"), entry_point)]
+pub fn instantiate(
+    deps: DepsMut,
+    _envs: Env,
+    info: MessageInfo,
+    msg: InstantiateMsg,
+) -> Result<Response, ContractError>{
+    set_contract_version(deps.storage, CONTRACT_NAME, CONTRACT_VERSION)?;
+    Ok(Response::new().add_attribute("method", "instantiate"))
+}
+
+#[cfg_attr(not(feature = "library"), entry_point)]
+pub fn execute(
+    deps: DepsMut,
+    _env: Env,
+    info: MessageInfo,
+    msg: ExecuteMsg,
+) -> Result<Response, ContractError> {
+    match msg {
+        ExecuteMsg::Transfer {recipient, amount, denom, message, block_height, proof} => execute_varified_transfer(deps, _env, info, recipient, amount, denom, message, block_height, proof),
+    }
+}
+
+fn execute_varified_transfer(
+    deps: DepsMut<'_>,
+    _env: Env,
+    info: MessageInfo,
+    recipient: String,
+    amount: Uint128,
+    denom: String,
+    message: DeliverableMessage,
+    block_height: u64,
+    proof: MerkleProof,
+) -> Result<Response, ContractError> {
+
+    if amount == Uint128::zero() {
+        return Err(ContractError::InvalidZeroAmount {});
+    }
+
+    let mut msgs: Vec<CosmosMsg> = vec![];
+
+    // TO DO (Begin)
+    let query_msg: VerifyQueryMsg = VerifyQueryMsg::CheckVerify({
+        message: message,
+        block_height: block_height,
+        proof: proof,
+    });
+    let query_response: VerifyResponse = deps.querier.query(
+        &QueryRequest::Wasm(WasmQuery::Smart { 
+            contract_addr: LIGHT_CLIENT_CONTRACT_ADDRESS,
+            message: to_binary(&query_msg)?,
+    }))?;
+
+    if (query_response.is_verified) {
+        let amount_int: u128 = amount.parse().unwrap();
+        msgs.push(CosmosMsg::Bank(BankMsg::Send{
+            to_address: recipient,
+            amount: coins(
+                amount_int, 
+                denom,
+            ),
+        }));
+    } else {
+        Err(ContractError::VerifyFail {})
+    }
+
+    Ok(
+        Response::new()
+        .add_attribute("method", "execute_verified_transfer")
+        .add_messages(msgs)
+    )    
+}
+
+#[cfg_attr(not(feature = "library"), entry_point)]
+pub fn query(
+    deps: Deps,
+    _env: Env,
+    msg: QueryMsg
+) -> StdResult<Binary> {
+
+    match msg {
+        QueryMsg::GetBalance {address, denom} => to_binary(&query_balance(deps, address, denom)?),
+        QueryMsg::GetAllBalance {address} => to_binary(&query_all_balance(address)?),
+    }
+}
+
+fn query_balance(
+    deps:Deps,
+    address: String, 
+    denom: String,
+) -> StdResult<Coin> {
+
+    let balanceResponse: BalanceResponse = deps.querier.query_balance(address, denom)?;
+    Ok(balanceResponse)
+}
+
+fn query_all_balance(
+    deps:Deps,
+    address: String,
+) -> StdResult<Coin> {
+
+    let balanceResponse: BalanceAllResponse = deps.querier.query_all_balance(address)?;
+    Ok(balanceResponse)
+}

contracts/test-treasury-cross/src/error.rs

@@ -0,0 +1,19 @@
+use cosmwasm_std::StdError;
+use thiserror::Error;
+
+#[derive(Error, Debug)]
+pub enum ContractError {
+    #[error("{0}")]
+    Std(#[from] StdError),
+
+    #[error("Verification failed")]
+    VerifyFail {},
+
+    #[error("Invalid zero amount")]
+    InvalidZeroAmount {},
+
+    #[error("Custom Error val: {val:?}")]
+    CustomError { val: String },
+    // Add any other custom errors you like here.
+    // Look at https://docs.rs/thiserror/1.0.21/thiserror/ for details.
+}