Merge branch 'main' into feat-add-pryzm-swap-venue

# Conflicts:
#	Cargo.lock
#	Cargo.toml

Cargo.toml

@@ -27,8 +27,8 @@ dexter-stable-pool   = "1.1.1"
 dexter-weighted-pool = "1.1.1"
 dexter-lp-token  = "1.0.0"
 dexter-router    = "1.1.0"
-cosmwasm-schema  = "1.5.0"
-cosmwasm-std     = { version = "1.5", features = ["stargate"] }
+cosmwasm-schema  = "1.5.4"
+cosmwasm-std     = { version = "1.5.4", features = ["stargate"] }
 cosmos-sdk-proto = { version = "0.19", default-features = false }
 cw2              = "1.1"
 cw20             = "1.1"
@@ -37,15 +37,17 @@ cw-utils         = "1.0.3"
 cw-multi-test    = "0.20.0"
 ibc-proto        = { version = "0.32.1", default-features = false }
 lido-satellite   = { git = "https://github.com/hadronlabs-org/lido-satellite", branch = "main", features = ["library"] }
+drop-factory     = { git = "https://github.com/hadronlabs-org/drop-contracts.git", branch = "feat/audit-fixes", features = ["library"] }
+drop-staking-base = { git = "https://github.com/hadronlabs-org/drop-contracts.git", branch = "feat/audit-fixes", features = ["library"] }
 mockall          = "0.12.1"
 neutron-proto    = { version = "0.1.1", default-features = false, features = ["cosmwasm"] }
-neutron-sdk      = "0.8"
+neutron-sdk      = "0.10.0"
 osmosis-std      = "0.15.3"
 prost            = "0.11"
 pryzm-std        = "0.1.7"
 serde            = { version = "1.0.194", default-features = false, features = ["derive"] }
 serde-cw-value   = "0.7.0"
-serde-json-wasm  = "0.5.1"
+serde-json-wasm  = "1.0.1"
 skip             = { version = "0.3.0", path = "./packages/skip" }
 test-case        = "3.3.1"
 thiserror        = "1"

contracts/adapters/swap/drop/Cargo.toml

@@ -0,0 +1,34 @@
+[package]
+name          = "skip-go-swap-adapter-drop"
+version       = { workspace = true }
+rust-version  = { workspace = true }
+authors       = { workspace = true }
+edition       = { workspace = true }
+license       = { workspace = true }
+homepage      = { workspace = true }
+repository    = { workspace = true }
+documentation = { workspace = true }
+keywords      = { workspace = true }
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[features]
+# for more explicit tests, cargo test --features=backtraces
+backtraces = ["cosmwasm-std/backtraces"]
+# use library feature to disable all instantiate/execute/query exports
+library = []
+
+[dependencies]
+cosmwasm-schema  = { workspace = true }
+cosmwasm-std     = { workspace = true }
+cw2              = { workspace = true }
+cw-storage-plus  = { workspace = true }
+cw-utils         = { workspace = true }
+skip             = { workspace = true }
+thiserror        = { workspace = true }
+drop-factory     = { workspace = true }
+drop-staking-base = { workspace = true }
+
+[dev-dependencies]
+test-case        = { workspace = true }

contracts/adapters/swap/drop/README.md

@@ -0,0 +1,3 @@
+# Drop Swap Adapter Contract
+
+This contract is a simple swap adapter that treats the Drop core contract to be swapped through.

contracts/adapters/swap/drop/src/bin/drop-schema.rs

@@ -0,0 +1,10 @@
+use cosmwasm_schema::write_api;
+use skip::swap::{DropBondInstantiateMsg as InstantiateMsg, ExecuteMsg, QueryMsg};
+
+fn main() {
+    write_api! {
+        instantiate: InstantiateMsg,
+        execute: ExecuteMsg,
+        query: QueryMsg
+    }
+}