Merge branch 'main' into release-v0.5.4

zeitgeistpm · Aug 20, 2024 · de3172c · de3172c
2 parents 2df7347 + b046f04
commit de3172c
Show file tree

Hide file tree

Showing 7 changed files with 323 additions and 32 deletions.
diff --git 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
@@ -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
@@ -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!(

diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs
@@ -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,

diff --git a/runtime/zeitgeist/src/lib.rs b/runtime/zeitgeist/src/lib.rs
@@ -191,6 +191,10 @@ impl Contains<RuntimeCall> for IsCallable {
     }
 }
 
+parameter_types! {
+    pub RemovableMarketIds: Vec<u32> = 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
@@ -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>>;