Merge pull request #25 from burnt-labs/feat/treasury

Treasury Contract

Author: ash-burnt

Cargo.toml

@@ -1,6 +1,6 @@
 [workspace]
 members = [
-    "account"
+    "contracts/*",
 ]
 
 [profile.release]
@@ -9,18 +9,16 @@ overflow-checks = true     # Disable integer overflow checks.
 
 
 [workspace.dependencies]
-cosmos-sdk-proto = { version = "0.19", default-features = false }
 cosmwasm-schema  = "=1.4.1"
 cosmwasm-std     = { version = "=1.4.1", features = ["stargate"] }
 cw2              = "1.1.1"
 cw-storage-plus  = "1.1.0"
 cw-utils         = "1.0.2"
 hex              = "0.4"
-prost            = "0.11"
 sha2             = { version = "0.10.8", features = ["oid"]}
 thiserror        = "1"
 tiny-keccak      = { version = "2", features = ["keccak"] }
-serde = { version = "1.0.145", default-features = false, features = ["derive"] }
+serde = { version = "1.0.203", default-features = false, features = ["derive"] }
 serde_json = "1.0.87"
 schemars = "0.8.10"
 ripemd = "0.1.3"
@@ -30,3 +28,8 @@ phf = { version = "0.11.2", features = ["macros"] }
 rsa = { version = "0.9.2" }
 getrandom = { version = "0.2.10", features = ["custom"] }
 p256 = {version = "0.13.2", features = ["ecdsa-core", "arithmetic", "serde"]}
+prost = {version = "0.11.2", default-features = false, features = ["prost-derive"]}
+cosmos-sdk-proto = {git = "https://github.com/burnt-labs/cosmos-rust.git", rev = "9108ae0517bd9fd543c0662e06598032a642e426", default-features = false, features = ["cosmwasm", "xion"]}
+osmosis-std-derive = "0.13.2"
+prost-types = "0.12.6"
+pbjson-types = "0.6.0"

README.md

@@ -2,8 +2,8 @@
 
 ```bash
 
-docker run --rm -v "$(pwd)":/code \
+ docker run --rm -v "$(pwd)":/code \
   --mount type=volume,source="$(basename "$(pwd)")_cache",target=/target \
   --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
-  cosmwasm/workspace-optimizer:0.14.0
+  cosmwasm/optimizer:0.15.1
 ```

account/Cargo.toml renamed to contracts/account/Cargo.toml

@@ -27,9 +27,5 @@ phf               = { workspace = true }
 rsa               = { workspace = true }
 getrandom         = { workspace = true }
 p256              = { workspace = true }
-url = "2.4.1"
-coset = "0.3.5"
-futures = "0.3.29"
-async-trait = "0.1.74"
-prost = {version = "0.11.2", default-features = false, features = ["prost-derive"]}
-osmosis-std-derive = "0.13.2"
+prost = { workspace = true }
+osmosis-std-derive = { workspace = true }

account/src/auth.rs renamed to contracts/account/src/auth.rs

@@ -42,7 +42,7 @@ pub fn verify(
     let query = proto::QueryValidateJWTRequest {
         aud: aud.to_string(),
         sub: sub.to_string(),
-        sig_bytes: String::from_utf8(sig_bytes.into()).unwrap(),
+        sig_bytes: String::from_utf8(sig_bytes.into())?,
         // tx_hash: challenge,
     };