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

Jump to bottom

Add missing Admin to state export / import #141

Merged
merged 2 commits into from
Jun 2, 2022
Merged

Add missing Admin to state export / import #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d16e8c
Add missing Admin to state export / import
Jun 2, 2022
c2337b9
Add admin check during export / Some admin during import
Jun 2, 2022
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
4 changes: 4 additions & 0 deletions contracts/tgrade-valset/src/multitest/export_import.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ fn export_works() {
}
);

assert_eq!(exp.admin, Some(Addr::unchecked("admin")));

assert_eq!(
exp.config,
Config {
Expand Down Expand Up @@ -78,6 +80,7 @@ fn import_works() {
contract: "contract_name".to_owned(),
version: "version".to_owned(),
},
admin: Some(Addr::unchecked("imported_admin")),
config: Config {
membership: Tg4Contract(Addr::unchecked("membership")),
min_points: 30,
Expand Down Expand Up @@ -144,6 +147,7 @@ fn import_deletes_existing_entries() {
contract: "contract_name".to_owned(),
version: "version".to_owned(),
},
admin: None,
config: Config {
membership: Tg4Contract(Addr::unchecked("membership")),
min_points: 30,
Expand Down
7 changes: 5 additions & 2 deletions contracts/tgrade-valset/src/state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use cosmwasm_std::{to_binary, Addr, Coin, Decimal, Deps, DepsMut, Response, StdR
use cw2::{get_contract_version, set_contract_version, ContractVersion};
use cw_storage_plus::{Index, IndexList, IndexedMap, Item, Map, UniqueIndex};
use tg4::Tg4Contract;
use tg_utils::Duration;
use tg_utils::{Duration, ADMIN};

use crate::error::ContractError;
use crate::msg::{default_fee_percentage, JailingPeriod, OperatorResponse, ValidatorMetadata};
Expand Down Expand Up @@ -178,6 +178,7 @@ pub struct SlashingResponse {
#[derive(Serialize, Deserialize, Clone, PartialEq, JsonSchema, Debug)]
pub struct ValsetState {
pub contract_version: ContractVersion,
pub admin: Option<Addr>,
pub config: Config,
pub epoch: EpochInfo,
pub operators: Vec<OperatorResponse>,
Expand All @@ -190,6 +191,7 @@ pub struct ValsetState {
pub fn export(deps: Deps<TgradeQuery>) -> Result<Response<TgradeMsg>, ContractError> {
// Valset state items
let mut state = ValsetState {
admin: ADMIN.get(deps)?,
contract_version: get_contract_version(deps.storage)?,
config: CONFIG.load(deps.storage)?,
epoch: EPOCH.load(deps.storage)?,
Expand Down Expand Up @@ -242,7 +244,7 @@ pub fn export(deps: Deps<TgradeQuery>) -> Result<Response<TgradeMsg>, ContractEr

/// Import state
pub fn import(
deps: DepsMut<TgradeQuery>,
mut deps: DepsMut<TgradeQuery>,
state: ValsetState,
) -> Result<Response<TgradeMsg>, ContractError> {
// Valset state items
Expand All @@ -251,6 +253,7 @@ pub fn import(
state.contract_version.contract,
state.contract_version.version,
)?;
ADMIN.set(deps.branch(), state.admin)?;
CONFIG.save(deps.storage, &state.config)?;
EPOCH.save(deps.storage, &state.epoch)?;
VALIDATORS.save(deps.storage, &state.validators)?;
Expand Down