Merge branch 'development' into feature/cw-orch-interface

Arena-DAO · Jul 23, 2024 · 26413fc · 26413fc
2 parents cf63b3f + 75272b9
commit 26413fc
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 48 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -61,8 +61,9 @@ osmosis-std = "0.20.1"
 osmosis-std-derive = "0.20.1"
 osmosis-test-tube = "20.1.1"
 proc-macro2 = "1.0"
-prost = { version = "0.12.3", features = ["prost-derive"] }
-prost-types = { version = "0.12.3", default-features = false }
+prost = { version = "=0.12.3", features = ["prost-derive"] }
+prost-types = { version = "=0.12.3", default-features = false }
+prost-derive = "=0.12.3"
 quote = "1.0"
 rand = "0.8"
 schemars = "0.8"

diff --git a/contracts/external/btsg-ft-factory/Cargo.toml b/contracts/external/btsg-ft-factory/Cargo.toml
@@ -24,6 +24,7 @@ cw2 = { workspace = true }
 dao-interface = { workspace = true }
 osmosis-std-derive = { workspace = true }
 prost = { workspace = true }
+prost-derive = { workspace = true }
 prost-types = { workspace = true }
 schemars = { workspace = true }
 serde = { workspace = true }

diff --git a/contracts/external/cw-tokenfactory-issuer/Cargo.toml b/contracts/external/cw-tokenfactory-issuer/Cargo.toml
@@ -52,6 +52,7 @@ cw-tokenfactory-types = { workspace = true, default-features = false }
 dao-interface = { workspace = true }
 osmosis-std = { workspace = true }
 prost = { workspace = true }
+prost-derive = { workspace = true }
 schemars = { workspace = true }
 serde = { workspace = true, default-features = false, features = ["derive"] }
 thiserror = { workspace = true }

diff --git a/contracts/voting/dao-voting-onft-staked/Cargo.toml b/contracts/voting/dao-voting-onft-staked/Cargo.toml
@@ -52,3 +52,4 @@ dao-test-custom-factory = { workspace = true }
 dao-testing = { workspace = true, features = ["test-tube"] }
 osmosis-test-tube = { workspace = true }
 prost = { workspace = true }
+prost-derive = { workspace = true }
diff --git a/packages/cw-tokenfactory-types/Cargo.toml b/packages/cw-tokenfactory-types/Cargo.toml
@@ -23,6 +23,7 @@ dao-interface = { workspace = true }
 osmosis-std = { workspace = true }
 osmosis-std-derive = { workspace = true }
 prost = { workspace = true }
+prost-derive = { workspace = true }
 prost-types = { workspace = true }
 schemars = { workspace = true }
 serde = { workspace = true }