Skip to content

Commit

Permalink
Merge release
Browse files Browse the repository at this point in the history
  • Loading branch information
ShadoySV committed Feb 28, 2023
2 parents 6da1b47 + 042b076 commit b9f30fb
Show file tree
Hide file tree
Showing 118 changed files with 1,328 additions and 7,959 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check_artifacts_size.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
steps:
- name: Checkout sources
uses: actions/checkout@v2
- uses: actions/cache@v2
- uses: actions/cache@v3
with:
path: |
~/.cargo/bin
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/release_artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,21 @@ name: Release Artifacts
on:
push:
tags:
- '*'
- "v*.*.*"

jobs:
release-artifacts:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Build Artifacts
run: |
$GITHUB_WORKSPACE/scripts/build_release.sh
tar -zcvf cosmwasm-artifacts.tar.gz artifacts
- name: Create Release
uses: softprops/action-gh-release@v1
with:
files: cosmwasm-artifacts.tar.gz
files: cosmwasm-artifacts.tar.gz
token: ${{ secrets.GH_TOKEN }}
env:
GITHUB_REPOSITORY: astroport-fi/astroport-core
2 changes: 1 addition & 1 deletion .github/workflows/tests_and_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

- name: Checkout sources
uses: actions/checkout@v2
- uses: actions/cache@v2
- uses: actions/cache@v3
with:
path: |
~/.cargo/bin
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ target/
/scripts/node_modules/
#/scripts/package-lock.json
/artifacts/
/contracts/**/schema/
/contracts/**/schema/
68 changes: 34 additions & 34 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ members = [
"contracts/tokenomics/xastro_token",
"contracts/periphery/*",
]
exclude = [
"contracts/pair_stable_bluna", # TODO: update this when bluna migrated to cosmwasm 1.0.0
]

[patch.'https://github.com/astroport-fi/hidden_astroport_core.git']
astroport = { path = "packages/astroport" }
Expand Down
10 changes: 5 additions & 5 deletions contracts/factory/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "astroport-factory"
version = "1.4.0"
version = "1.5.0"
authors = ["Astroport"]
edition = "2021"
description = "Astroport factory contract - pair contract generator and directory"
Expand All @@ -27,14 +27,14 @@ cosmwasm-std = "1.1"
astroport = { path = "../../packages/astroport", default-features = false }
cw-storage-plus = "0.15"
cw2 = "0.15"
thiserror = { version = "1.0" }
thiserror = "1.0"
protobuf = { version = "2", features = ["with-bytes"] }
itertools = "0.10"
cosmwasm-schema = "1.1"

[dev-dependencies]
cw-multi-test = "0.15"
astroport-token = {path = "../token"}
astroport-pair = {path = "../pair"}
cw20 = { version = "0.15" }
astroport-token = { path = "../token" }
astroport-pair = { path = "../pair" }
cw20 = "0.15"
anyhow = "1.0"
29 changes: 8 additions & 21 deletions contracts/factory/examples/factory_schema.rs
Original file line number Diff line number Diff line change
@@ -1,24 +1,11 @@
use std::env::current_dir;
use std::fs::create_dir_all;

use cosmwasm_schema::{export_schema_with_title, remove_schemas, schema_for};

use astroport::asset::PairInfo;
use astroport::factory::{
ConfigResponse, ExecuteMsg, InstantiateMsg, MigrateMsg, PairsResponse, QueryMsg,
};
use astroport::factory::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
use cosmwasm_schema::write_api;

fn main() {
let mut out_dir = current_dir().unwrap();
out_dir.push("schema");
create_dir_all(&out_dir).unwrap();
remove_schemas(&out_dir).unwrap();

export_schema_with_title(&schema_for!(InstantiateMsg), &out_dir, "InstantiateMsg");
export_schema_with_title(&schema_for!(ExecuteMsg), &out_dir, "ExecuteMsg");
export_schema_with_title(&schema_for!(QueryMsg), &out_dir, "QueryMsg");
export_schema_with_title(&schema_for!(PairInfo), &out_dir, "PairInfo");
export_schema_with_title(&schema_for!(PairsResponse), &out_dir, "PairsResponse");
export_schema_with_title(&schema_for!(ConfigResponse), &out_dir, "ConfigResponse");
export_schema_with_title(&schema_for!(MigrateMsg), &out_dir, "MigrateMsg");
write_api! {
instantiate: InstantiateMsg,
query: QueryMsg,
execute: ExecuteMsg,
migrate: MigrateMsg,
}
}
Loading

0 comments on commit b9f30fb

Please sign in to comment.