diff --git a/Makefile b/Makefile index c4b4241c1..d6887defc 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/integration-tests/moonwall.config.json b/integration-tests/moonwall.config.json index 18cec7399..55da73649 100644 --- a/integration-tests/moonwall.config.json +++ b/integration-tests/moonwall.config.json @@ -61,7 +61,7 @@ } ] }, - "envVars": ["LOG_LEVEL=debug", "VERBOSE_LOG"], + "envVars": ["LOG_LEVEL=debug", "VERBOSE_LOG=true"], "buildBlockMode": "manual", "connections": [ { @@ -106,7 +106,7 @@ } ] }, - "envVars": ["LOG_LEVEL=debug", "VERBOSE_LOG"], + "envVars": ["LOG_LEVEL=debug", "VERBOSE_LOG=true"], "buildBlockMode": "manual", "connections": [ { diff --git a/runtime/battery-station/src/lib.rs b/runtime/battery-station/src/lib.rs index 6f2069d77..10b98a779 100644 --- a/runtime/battery-station/src/lib.rs +++ b/runtime/battery-station/src/lib.rs @@ -174,6 +174,10 @@ impl Contains for IsCallable { } } +parameter_types! { + pub RemovableMarketIds: Vec = vec![879u32, 877u32, 878u32, 880u32, 882u32]; +} + decl_common_types!(); create_runtime_with_additional_pallets!( diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs index 253d27f76..5df46676e 100644 --- a/runtime/common/src/lib.rs +++ b/runtime/common/src/lib.rs @@ -87,6 +87,7 @@ macro_rules! decl_common_types { }; use zeitgeist_primitives::traits::{DeployPoolApi, DistributeFees, MarketCommonsPalletApi}; + pub type Block = generic::Block; type Address = sp_runtime::MultiAddress; diff --git a/runtime/zeitgeist/src/lib.rs b/runtime/zeitgeist/src/lib.rs index a29bb28f1..083ba343e 100644 --- a/runtime/zeitgeist/src/lib.rs +++ b/runtime/zeitgeist/src/lib.rs @@ -191,6 +191,10 @@ impl Contains for IsCallable { } } +parameter_types! { + pub RemovableMarketIds: Vec = vec![]; +} + decl_common_types!(); create_runtime_with_additional_pallets!(); diff --git a/zrml/market-commons/src/lib.rs b/zrml/market-commons/src/lib.rs index cce65a670..2189acbbc 100644 --- a/zrml/market-commons/src/lib.rs +++ b/zrml/market-commons/src/lib.rs @@ -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 = ::AccountId; pub(crate) type AssetOf = Asset>; diff --git a/zrml/market-commons/src/migrations.rs b/zrml/market-commons/src/migrations.rs index 7bcc6e2e5..9a6bb291d 100644 --- a/zrml/market-commons/src/migrations.rs +++ b/zrml/market-commons/src/migrations.rs @@ -14,4 +14,4 @@ // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with Zeitgeist. If not, see . +// along with Zeitgeist. If not, see . \ No newline at end of file