Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump vault contract version before migration on terra #223

Merged
merged 1 commit into from
Oct 20, 2023
Merged

chore: bump vault contract version before migration on terra #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

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

17 changes: 7 additions & 10 deletions contracts/liquidity_hub/pool-network/terraswap_pair/src/contract.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,18 +238,15 @@ pub fn migrate(mut deps: DepsMut, _env: Env, _msg: MigrateMsg) -> Result<Respons

check_contract_name(deps.storage, CONTRACT_NAME.to_string())?;

//let version: Version = CONTRACT_VERSION.parse()?;
let version: Version = CONTRACT_VERSION.parse()?;
let storage_version: Version = get_contract_version(deps.storage)?.version.parse()?;

// we remove this block not to bump the version of the contract again as the migration was done
// already (without the token factory fix)

// if storage_version >= version {
// return Err(ContractError::MigrateInvalidVersion {
// current_version: storage_version,
// new_version: version,
// });
// }
if storage_version >= version {
return Err(ContractError::MigrateInvalidVersion {
current_version: storage_version,
new_version: version,
});
}

if storage_version <= Version::parse("1.0.4")? {
migrations::migrate_to_v110(deps.branch())?;
Expand Down
2 changes: 1 addition & 1 deletion contracts/liquidity_hub/vault-network/vault/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "vault"
version = "1.2.3"
version = "1.2.4"
authors = ["kaimen-sano <[email protected]>"]
edition.workspace = true
description = "Contract to handle a single vault that controls an asset"
Expand Down
4 changes: 2 additions & 2 deletions scripts/build_release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ flag=""

case $chain in

juno)
juno | terra)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Terra is using now the osmosis token factory.

flag="-osmosis_token_factory"
;;
terra | migaloo)
migaloo)
flag="-token_factory"
;;
injective)
Expand Down
Loading