Skip to content

Commit 1d6a6cf

Browse files
adairrradairrr
authored
Merge pull request #28 from AbstractSDK/0.17.2
Bump to 0.17.2 to add neutron to abstract_sdk registry
2 parents dfaa4cf + d57704d commit 1d6a6cf

17 files changed

Lines changed: 109 additions & 76 deletions

File tree

‎app-template/Cargo.toml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,19 @@ thiserror = { version = "1.0" }
4141
schemars = "0.8"
4242
cw-asset = { version = "3.0" }
4343

44-
abstract-core = { version = "0.17.0" }
45-
abstract-app = { version = "0.17.0" }
46-
abstract-sdk = { version = "0.17.0" }
44+
abstract-core = { version = "0.17.2" }
45+
abstract-app = { version = "0.17.2" }
46+
abstract-sdk = { version = "0.17.2" }
4747

4848
# Dependencies for interface
49-
abstract-interface = { version = "0.17.0", optional = true }
49+
abstract-interface = { version = "0.17.2", optional = true }
5050
cw-orch = { version = "0.13", optional = true }
5151

5252
[dev-dependencies]
5353
app = { path = ".", features = ["interface"] }
54-
abstract-interface = { version = "0.17.0", features = ["daemon"] }
55-
abstract-testing = { version = "0.17.0" }
56-
abstract-sdk = { version = "0.17.0", features = ["test-utils"] }
54+
abstract-interface = { version = "0.17.2", features = ["daemon"] }
55+
abstract-testing = { version = "0.17.2" }
56+
abstract-sdk = { version = "0.17.2", features = ["test-utils"] }
5757
speculoos = "0.11.0"
5858
semver = "1.0"
5959
dotenv = "0.15.0"

‎framework/CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
1313

1414
### Fixed
1515

16+
## [0.17.2] - 2023-07-27
17+
18+
### Added
19+
- Neutron + Archway to registry
20+
21+
### Changed
22+
23+
### Fixed
24+
1625
## [0.17.0] - 2023-07-05
1726

1827
### Added

‎framework/Cargo.toml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ members = ["packages/*", "contracts/native/*", "contracts/account/*", "scripts"]
1212
resolver = "2"
1313

1414
[workspace.package]
15-
version = "0.17.0"
15+
version = "0.17.2"
1616
authors = [
1717
"CyberHoward <cyberhoward@protonmail.com>",
1818
"Riada <riada@abstract.money>",
@@ -52,8 +52,8 @@ tokio = { version = "1.4", features = ["full"] }
5252

5353
## crates in order of publishing ## see docs/Publishing.md
5454

55-
abstract-adapter = { version = "0.17.0", path = "packages/abstract-adapter" }
56-
abstract-app = { version = "0.17.0", path = "packages/abstract-app" }
55+
abstract-adapter = { version = "0.17.2", path = "packages/abstract-adapter" }
56+
abstract-app = { version = "0.17.2", path = "packages/abstract-app" }
5757

5858
# Keep these as path, creates cirular dependency otherwise
5959
# Only need to re-publish all contracts if a re-publish of abstract-interface is required
@@ -65,15 +65,15 @@ version-control = { package = "abstract-version-control", path = "contracts/nati
6565
proxy = { package = "abstract-proxy", path = "contracts/account/proxy" }
6666
manager = { package = "abstract-manager", path = "contracts/account/manager" }
6767

68-
abstract-sdk = { version = "0.17.0", path = "packages/abstract-sdk" }
69-
abstract-testing = { version = "0.17.0", path = "packages/abstract-testing" }
70-
abstract-core = { version = "0.17.0", path = "packages/abstract-core" }
68+
abstract-sdk = { version = "0.17.2", path = "packages/abstract-sdk" }
69+
abstract-testing = { version = "0.17.2", path = "packages/abstract-testing" }
70+
abstract-core = { version = "0.17.2", path = "packages/abstract-core" }
7171

7272
# These should remain fixed and don't need to be re-published (unless changes are made)
73-
abstract-macros = { version = "0.17.0", path = "packages/abstract-macros" }
74-
abstract-ica = { version = "0.17.0", path = "packages/abstract-ica" }
73+
abstract-macros = { version = "0.17.2", path = "packages/abstract-macros" }
74+
abstract-ica = { version = "0.17.2", path = "packages/abstract-ica" }
7575

76-
abstract-adapter-utils = { version = "0.17.0", path = "packages/utils" }
76+
abstract-adapter-utils = { version = "0.17.2", path = "packages/utils" }
7777
abstract-dex-adapter-traits = { path = "packages/dex" }
7878
abstract-staking-adapter-traits = { path = "packages/staking" }
7979

‎framework/packages/abstract-adapter/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "abstract-adapter"
3-
version = "0.17.0"
3+
version = "0.17.2"
44
authors = { workspace = true }
55
edition = { workspace = true }
66
license = { workspace = true }
@@ -30,7 +30,7 @@ abstract-core = { workspace = true }
3030
abstract-testing = { workspace = true, optional = true }
3131
cw-orch = { workspace = true, optional = true }
3232
# Keep this as a version and update when publishing new versions
33-
abstract-interface = { path = "../../packages/abstract-interface", version = "0.17.0", optional = true }
33+
abstract-interface = { path = "../../packages/abstract-interface", version = "0.17.2", optional = true }
3434

3535
[dev-dependencies]
3636
speculoos = { workspace = true }

‎framework/packages/abstract-app/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "abstract-app"
3-
version = "0.17.0"
3+
version = "0.17.2"
44
edition = { workspace = true }
55
license = { workspace = true }
66
description = "base app contract implementation"
@@ -30,7 +30,7 @@ abstract-core = { workspace = true }
3030
abstract-testing = { workspace = true, optional = true }
3131
cw-orch = { workspace = true, optional = true }
3232
# Keep this as a version and update when publishing new versions
33-
abstract-interface = { path = "../../packages/abstract-interface", version = "0.17.0", optional = true }
33+
abstract-interface = { path = "../../packages/abstract-interface", version = "0.17.2", optional = true }
3434

3535
[dev-dependencies]
3636
cosmwasm-schema = { workspace = true }

‎framework/packages/abstract-core/src/registry.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@ pub const ICS20: &str = "ics-20";
1919

2020
// chain-id prefixes based on `https://cosmos.directory/`
2121
pub const JUNO: &[&str] = &["juno", "uni"];
22-
pub const OSMOSIS: &[&str] = &["osmosis", "osmo"];
22+
pub const OSMOSIS: &[&str] = &["osmosis", "osmo", "osmo-test"];
2323
pub const TERRA: &[&str] = &["phoenix", "pisco"];
2424
pub const KUJIRA: &[&str] = &["kaiyo", "harpoon"];
25-
pub const ARCHWAY: &[&str] = &["constantine"];
25+
pub const NEUTRON: &[&str] = &["pion", "neutron"];
26+
pub const ARCHWAY: &[&str] = &["constantine", "archway"];
2627
pub const LOCAL_CHAIN: &[&str] = &["cosmos-testnet"];
2728
/// Useful when deploying version control
2829
#[allow(unused)]

‎framework/packages/abstract-interface/Cargo.toml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "abstract-interface"
3-
version = "0.17.0"
3+
version = "0.17.2"
44
edition = { workspace = true }
55
license = { workspace = true }
66
description = "Abstract deployment helpers with cw-orchestrator"
@@ -30,12 +30,12 @@ serde_json = "1.0.79"
3030
speculoos = { workspace = true }
3131

3232
# Keep these here
33-
module-factory = { package = "abstract-module-factory", path = "../../contracts/native/module-factory", default-features = false, version = "0.17.0" }
34-
account-factory = { package = "abstract-account-factory", path = "../../contracts/native/account-factory", default-features = false, version = "0.17.0" }
35-
ans-host = { package = "abstract-ans-host", path = "../../contracts/native/ans-host", default-features = false, version = "0.17.0" }
36-
version-control = { package = "abstract-version-control", path = "../../contracts/native/version-control", default-features = false, version = "0.17.0" }
37-
proxy = { package = "abstract-proxy", path = "../../contracts/account/proxy", default-features = false, version = "0.17.0" }
38-
manager = { package = "abstract-manager", path = "../../contracts/account/manager", default-features = false, version = "0.17.0" }
33+
module-factory = { package = "abstract-module-factory", path = "../../contracts/native/module-factory", default-features = false, version = "0.17.2" }
34+
account-factory = { package = "abstract-account-factory", path = "../../contracts/native/account-factory", default-features = false, version = "0.17.2" }
35+
ans-host = { package = "abstract-ans-host", path = "../../contracts/native/ans-host", default-features = false, version = "0.17.2" }
36+
version-control = { package = "abstract-version-control", path = "../../contracts/native/version-control", default-features = false, version = "0.17.2" }
37+
proxy = { package = "abstract-proxy", path = "../../contracts/account/proxy", default-features = false, version = "0.17.2" }
38+
manager = { package = "abstract-manager", path = "../../contracts/account/manager", default-features = false, version = "0.17.2" }
3939

4040
[build-dependencies]
4141
serde_json = "1.0.79"

‎framework/publish/packages.sh‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ then
1313
exit 1
1414
fi
1515

16-
ALL_PACKAGES="abstract-interface abstract-adapter abstract-app abstract-ibc-host"
16+
ALL_PACKAGES="abstract-interface abstract-adapter abstract-app abstract-ibc-host utils"
17+
# These need to update the dependency of abstract-interface to use the version
18+
OTHER_PACKAGES="dex staking"
1719

1820
for pack in $ALL_PACKAGES; do
1921
(
@@ -23,7 +25,26 @@ for pack in $ALL_PACKAGES; do
2325
)
2426
done
2527

26-
echo "Everything is published!"
28+
echo "Packages are published!"
29+
30+
read -p "Please update the version of 'abstract-interface' to the published version and type 'yes' to continue: " input
31+
if [ "$input" != "yes" ]
32+
then
33+
echo "The script will terminate now. Please run it again after updating the version."
34+
exit 1
35+
fi
36+
37+
echo "Continuing with the publication of other packages..."
38+
39+
for pack in $OTHER_PACKAGES; do
40+
(
41+
cd "packages/$pack"
42+
echo "Publishing $pack"
43+
cargo publish --allow-dirty
44+
)
45+
done
46+
47+
echo "All packages have been published!"
2748

2849
# VERSION=$(grep -A1 "\[workspace.package\]" Cargo.toml | awk -F'"' '/version/ {print $2}');
2950
# git tag v"$VERSION"

‎integrations/astroport/packages/abstract-adapter/Cargo.toml‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,13 @@ repository = "https://github.com/astroport-fi/astroport"
1010
[features]
1111
default = ["full_integration"]
1212
local = []
13-
full_integration = [
14-
"dep:cw20",
15-
"dep:cosmwasm-schema",
16-
"dep:cw-asset",
17-
"dep:cw-utils",
18-
"dep:astroport",
19-
]
13+
full_integration = ["dep:cw20", "dep:cosmwasm-schema", "dep:cw-asset", "dep:cw-utils", "dep:astroport"]
2014

2115
[dependencies]
2216
cosmwasm-std = { version = "1.1" }
23-
abstract-staking-adapter-traits = { version = "0.17.1" }
24-
abstract-dex-adapter-traits = { version = "0.17.1" }
25-
abstract-sdk = { version = "0.17.0" }
17+
abstract-staking-adapter-traits = { version = "0.17.2" }
18+
abstract-dex-adapter-traits = { version = "0.17.2" }
19+
abstract-sdk = { version = "0.17.2" }
2620

2721

2822
cw20 = { version = "0.15", optional = true }
@@ -31,9 +25,10 @@ cw-asset = { version = "3.0.0", optional = true }
3125
cw-utils = { version = "1.0.1", optional = true }
3226

3327
astroport = { path = "../astroport/", optional = true }
28+
lazy_static = "1.4.0"
3429

3530
[dev-dependencies]
36-
abstract-dex-adapter-traits = { version = "0.17.1", features = ["testing"] }
31+
abstract-dex-adapter-traits = { version = "0.17.2", features = ["testing"] }
3732
cw-orch = { version = "0.13", features = ["daemon"] }
3833
ibc-chain-registry = "0.24.1"
3934

‎integrations/astroport/packages/abstract-adapter/src/lib.rs‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,14 @@ pub const ASTROPORT: &str = "astroport";
22
#[cfg(feature = "local")]
33
pub const AVAILABLE_CHAINS: &[&str] = abstract_sdk::core::registry::LOCAL_CHAIN;
44
#[cfg(not(feature = "local"))]
5-
pub const AVAILABLE_CHAINS: &[&str] = abstract_sdk::core::registry::TERRA;
5+
lazy_static::lazy_static! {
6+
pub static ref AVAILABLE_CHAINS: Vec<&'static str> = {
7+
let mut v = Vec::new();
8+
v.extend_from_slice(abstract_sdk::core::registry::NEUTRON);
9+
v.extend_from_slice(abstract_sdk::core::registry::TERRA);
10+
v
11+
};
12+
}
613

714
pub mod dex;
815
pub mod staking;

0 commit comments

Comments
 (0)