Merge branch 'main' into feat/Moliholy/asset-conversion-pallet

paritytech · Dec 4, 2023 · e54cfe7 · e54cfe7
2 parents 053556d + 2f7e200
commit e54cfe7
Show file tree

Hide file tree

Showing 17 changed files with 137 additions and 787 deletions.
diff --git a/.github/workflows/build_docker.yml b/.github/workflows/build_docker.yml
@@ -14,7 +14,7 @@ jobs:
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
+        uses: docker/metadata-action@e6428a5c4e294a61438ed7f43155db912025b6b3 # v5.2.0
         with:
           images: paritytech/trappist
 

diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
@@ -20,7 +20,7 @@ jobs:
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
+        uses: docker/metadata-action@e6428a5c4e294a61438ed7f43155db912025b6b3 # v5.2.0
         with:
           images: paritytech/trappist
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -51,7 +51,6 @@ jsonrpsee = { version = "0.16.2" }
 # Trappist Pallets
 pallet-asset-registry = { default-features = false, path = "pallets/asset-registry" }
 trappist-runtime-benchmarks = { default-features = false, path = "pallets/benchmarks" }
-pallet-lockdown-mode = { version = "0.1.0", default-features = false, path = "pallets/lockdown-mode" }
 pallet-withdraw-teleport = { version = "0.1.0", default-features = false, path = "pallets/withdraw-teleport" }
 
 # Substrate std
@@ -138,6 +137,8 @@ pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/parityt
 pallet-uniques = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
 pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
 pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-safe-mode = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
+pallet-tx-pause = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
 
 # Cumulus client dependencies
 cumulus-client-cli = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.1.0" }

diff --git a/node/src/chain_spec/trappist.rs b/node/src/chain_spec/trappist.rs
@@ -24,7 +24,7 @@ use sc_service::ChainType;
 use sp_core::{crypto::UncheckedInto, sr25519};
 use trappist_runtime::{
 	constants::currency::EXISTENTIAL_DEPOSIT, AccountId, AssetsConfig, AuraId, BalancesConfig,
-	CouncilConfig, ForeignAssetsConfig, LockdownModeConfig, PoolAssetsConfig, RuntimeGenesisConfig,
+	CouncilConfig, ForeignAssetsConfig, PoolAssetsConfig, RuntimeGenesisConfig,
 	SessionConfig, SessionKeys, SudoConfig, SystemConfig,
 };
 
@@ -212,8 +212,9 @@ pub fn testnet_genesis(
 			members: invulnerables.into_iter().map(|x| x.0).collect::<Vec<_>>(),
 			phantom: Default::default(),
 		},
-		treasury: Default::default(),
-		lockdown_mode: LockdownModeConfig { initial_status: false, ..Default::default() },
+		treasury:  Default::default(),
+		safe_mode: Default::default(),
+		tx_pause: Default::default(),
 		foreign_assets: ForeignAssetsConfig { assets: vec![], accounts: vec![], metadata: vec![] },
 		pool_assets: PoolAssetsConfig { assets: vec![], accounts: vec![], metadata: vec![] },
 		transaction_payment: Default::default(),
@@ -331,7 +332,8 @@ fn trappist_live_genesis(
 			phantom: Default::default(),
 		},
 		treasury: Default::default(),
-		lockdown_mode: Default::default(),
+		safe_mode: Default::default(),
+		tx_pause: Default::default(),
 		foreign_assets: ForeignAssetsConfig { assets: vec![], accounts: vec![], metadata: vec![] },
 		pool_assets: PoolAssetsConfig { assets: vec![], accounts: vec![], metadata: vec![] },
 		transaction_payment: Default::default(),

diff --git a/pallets/lockdown-mode/Cargo.toml b/pallets/lockdown-mode/Cargo.toml
diff --git a/pallets/lockdown-mode/README.md b/pallets/lockdown-mode/README.md
diff --git a/pallets/lockdown-mode/src/benchmarking.rs b/pallets/lockdown-mode/src/benchmarking.rs