Diff for audit

Cargo.toml

@@ -2,6 +2,8 @@
 resolver = "2"
 members = [
     "contracts/*",
+    "e2e_tests",
+    "packages/*"
 ]
 
 [profile.release]
@@ -14,4 +16,11 @@ codegen-units = 1
 panic = 'abort'
 incremental = false
 overflow-checks = true
-strip = true
+strip = true
+
+[workspace.dependencies]
+astroport = { git = "https://github.com/astroport-fi/hidden_astroport_core", version = "3.7" }
+astroport-pcl-common = { git = "https://github.com/astroport-fi/hidden_astroport_core", version = "1.0.1" }
+astroport-circular-buffer = { git = "https://github.com/astroport-fi/hidden_astroport_core", version = "0.1.0" }
+astroport-native-coin-registry = "1.0.1"
+osmosis-std = "0.20.1"

contracts/factory/Cargo.toml

@@ -1,43 +1,31 @@
 [package]
-name = "astroport-factory"
-version = "1.6.0"
+name = "astroport-factory-osmosis"
+version = "1.0.0"
 authors = ["Astroport"]
 edition = "2021"
-description = "Astroport factory contract - pair contract generator and directory"
+description = "Astroport factory contract for Osmosis"
 license = "MIT"
 
-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"]
 
 [features]
-# for quicker tests, cargo test --lib
-# for more explicit tests, cargo test --features=backtraces
-backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-cosmwasm-std = "1.1"
-astroport = { version = "3" }
+cosmwasm-std = { version = "1", features = ["cosmwasm_1_1"] }
+cosmwasm-schema = "1"
 cw-storage-plus = "0.15"
-cw2 = "0.15"
+osmosis-std = { workspace = true }
+cw-utils = "1"
+cw2 = "1"
+astroport = { workspace = true }
+astroport-on-osmosis = { path = "../../packages/astroport_on_osmosis", version = "1" }
 thiserror = "1.0"
-protobuf = { version = "2", features = ["with-bytes"] }
-itertools = "0.10"
-cosmwasm-schema = "1.1"
-cw-utils = "1.0.1"
+itertools = "0.11"
 
 [dev-dependencies]
-cw-multi-test = "0.15"
-astroport-token = "1.1.1"
-astroport-pair = "1.5.0"
-cw20 = "0.15"
-anyhow = "1.0"
-prost = "0.11.5"
+astroport-pcl-osmo = { path = "../pair_concentrated" }
+cw-multi-test = { git = "https://github.com/CosmWasm/cw-multi-test", rev = "b1ce5acd07226b91c45f27b9bb01e67697cdd20f" }
+prost = "0.11"
+anyhow = "1"