Skip to content

Commit

Permalink
Merge branch 'main' into release-v0.5.4
Browse files Browse the repository at this point in the history
  • Loading branch information
Chralt98 committed Aug 20, 2024
2 parents 2df7347 + b046f04 commit de3172c
Show file tree
Hide file tree
Showing 7 changed files with 323 additions and 32 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ try-runtime-upgrade-battery-station:
--execute-try-runtime

try-runtime-upgrade-zeitgeist:
@$(MAKE) TRYRUNTIME_URL="wss://zeitgeist-rpc.dwellir.com:443" \
@$(MAKE) TRYRUNTIME_URL="wss://zeitgeist.api.onfinality.io:443/public-ws" \
RUNTIME_PATH="./target/release/wbuild/zeitgeist-runtime/zeitgeist_runtime.compact.compressed.wasm" \
-- \
--execute-try-runtime
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/moonwall.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
}
]
},
"envVars": ["LOG_LEVEL=debug", "VERBOSE_LOG"],
"envVars": ["LOG_LEVEL=debug", "VERBOSE_LOG=true"],
"buildBlockMode": "manual",
"connections": [
{
Expand Down Expand Up @@ -106,7 +106,7 @@
}
]
},
"envVars": ["LOG_LEVEL=debug", "VERBOSE_LOG"],
"envVars": ["LOG_LEVEL=debug", "VERBOSE_LOG=true"],
"buildBlockMode": "manual",
"connections": [
{
Expand Down
4 changes: 4 additions & 0 deletions runtime/battery-station/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,10 @@ impl Contains<RuntimeCall> for IsCallable {
}
}

parameter_types! {
pub RemovableMarketIds: Vec<u32> = vec![879u32, 877u32, 878u32, 880u32, 882u32];
}

decl_common_types!();

create_runtime_with_additional_pallets!(
Expand Down
5 changes: 3 additions & 2 deletions runtime/common/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,14 @@ macro_rules! decl_common_types {
generic, DispatchError, DispatchResult, RuntimeDebug, SaturatedConversion,
};
use zeitgeist_primitives::traits::{DeployPoolApi, DistributeFees, MarketCommonsPalletApi};
use zrml_market_commons::migrations::MigrateDisputeMechanism;
use zrml_market_commons::migrations::{MigrateDisputeMechanism, RemoveMarkets};

pub type Block = generic::Block<Header, UncheckedExtrinsic>;

type Address = sp_runtime::MultiAddress<AccountId, ()>;

type Migrations = (MigrateDisputeMechanism<Runtime>);
type Migrations =
(RemoveMarkets<Runtime, RemovableMarketIds>, MigrateDisputeMechanism<Runtime>);

pub type Executive = frame_executive::Executive<
Runtime,
Expand Down
4 changes: 4 additions & 0 deletions runtime/zeitgeist/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,10 @@ impl Contains<RuntimeCall> for IsCallable {
}
}

parameter_types! {
pub RemovableMarketIds: Vec<u32> = vec![];
}

decl_common_types!();

create_runtime_with_additional_pallets!();
Expand Down
2 changes: 1 addition & 1 deletion zrml/market-commons/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ mod pallet {
};

/// The current storage version.
const STORAGE_VERSION: StorageVersion = StorageVersion::new(11);
const STORAGE_VERSION: StorageVersion = StorageVersion::new(13);

pub(crate) type AccountIdOf<T> = <T as frame_system::Config>::AccountId;
pub(crate) type AssetOf<T> = Asset<MarketIdOf<T>>;
Expand Down
Loading

0 comments on commit de3172c

Please sign in to comment.