Merge pull request #812 from Phala-Network/polkadot-v0.9.23

Upgrade to Polkadot 0.9.23
Phala-Network · Jun 6, 2022 · 3a5aac1 · 3a5aac1
2 parents 3fa6fbd + 7f70f3b
commit 3a5aac1
Show file tree

Hide file tree

Showing 15 changed files with 353 additions and 387 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/pink/src/runtime.rs b/crates/pink/src/runtime.rs
@@ -97,13 +97,11 @@ parameter_types! {
     pub const MaxValueSize: u32 = 16_384;
     pub const DeletionQueueDepth: u32 = 1024;
     pub const DeletionWeightLimit: Weight = 500_000_000_000;
-    pub const MaxCodeSize: u32 = 2 * 1024 * 1024;
-    pub DefaultSchedule: Schedule<PinkRuntime> = {
-        let mut schedule = <Schedule<PinkRuntime>>::default();
-        schedule.limits.code_len = MaxCodeSize::get();
-        schedule
-    };
+    pub const MaxCodeLen: u32 = 2 * 1024 * 1024;
+    pub const RelaxedMaxCodeLen: u32 = 2 * 1024 * 1024;
     pub const TransactionByteFee: u64 = 0;
+
+    pub DefaultSchedule: Schedule<PinkRuntime> = Default::default();
 }
 
 impl Convert<Weight, Balance> for PinkRuntime {
@@ -130,6 +128,8 @@ impl Config for PinkRuntime {
     type DepositPerItem = ConstU128<0>;
     type AddressGenerator = Pink;
     type ContractAccessWeight = pallet_contracts::DefaultContractAccessWeight<RuntimeBlockWeights>;
+    type MaxCodeLen = MaxCodeLen;
+    type RelaxedMaxCodeLen = RelaxedMaxCodeLen;
 }
 
 

diff --git a/pallets/bridge/src/lib.rs b/pallets/bridge/src/lib.rs
@@ -433,7 +433,7 @@ pub mod pallet {
 		/// Provides an AccountId for the pallet.
 		/// This is used both as an origin check and deposit/withdrawal account.
 		pub fn account_id() -> T::AccountId {
-			MODULE_ID.into_account()
+			MODULE_ID.into_account_truncating()
 		}
 
 		/// Asserts if a resource is registered
@@ -710,7 +710,7 @@ pub mod pallet {
 	impl<T: Config> EnsureOrigin<T::Origin> for EnsureBridge<T> {
 		type Success = T::AccountId;
 		fn try_origin(o: T::Origin) -> Result<Self::Success, T::Origin> {
-			let bridge_id = MODULE_ID.into_account();
+			let bridge_id = MODULE_ID.into_account_truncating();
 			o.into().and_then(|o| match o {
 				system::RawOrigin::Signed(who) if who == bridge_id => Ok(bridge_id),
 				r => Err(T::Origin::from(r)),
@@ -719,7 +719,7 @@ pub mod pallet {
 
 		#[cfg(feature = "runtime-benchmarks")]
 		fn successful_origin() -> T::Origin {
-			let bridge_id = MODULE_ID.into_account();
+			let bridge_id = MODULE_ID.into_account_truncating();
 			T::Origin::from(system::RawOrigin::Signed(bridge_id))
 		}
 	}

diff --git a/pallets/bridge/src/mock.rs b/pallets/bridge/src/mock.rs
@@ -106,7 +106,7 @@ pub const ENDOWED_BALANCE: u64 = 100_000_000;
 pub const TEST_THRESHOLD: u32 = 2;
 
 pub fn new_test_ext() -> sp_io::TestExternalities {
-	let bridge_id = PalletId(*b"phala/bg").into_account();
+	let bridge_id = PalletId(*b"phala/bg").into_account_truncating();
 	let mut t = frame_system::GenesisConfig::default()
 		.build_storage::<Test>()
 		.unwrap();

diff --git a/pallets/bridge_transfer/src/mock.rs b/pallets/bridge_transfer/src/mock.rs
@@ -161,7 +161,7 @@ pub const RELAYER_C: u64 = 0x4;
 pub const ENDOWED_BALANCE: u64 = 100_000_000;
 
 pub fn new_test_ext() -> sp_io::TestExternalities {
-	let bridge_id = PalletId(*b"phala/bg").into_account();
+	let bridge_id = PalletId(*b"phala/bg").into_account_truncating();
 	let mut t = frame_system::GenesisConfig::default()
 		.build_storage::<Test>()
 		.unwrap();

diff --git a/pallets/kitties/src/lib.rs b/pallets/kitties/src/lib.rs
@@ -147,7 +147,7 @@ decl_module! {
 }
 impl<T: Config> Module<T> {
 	pub fn account_id() -> T::AccountId {
-		PALLET_ID.into_account()
+		PALLET_ID.into_account_truncating()
 	}
 
 	fn transfer(to: T::AccountId, kitty_id: T::Hash) -> Result {

diff --git a/pallets/phala/src/mining.rs b/pallets/phala/src/mining.rs
@@ -526,7 +526,7 @@ pub mod pallet {
 		BalanceOf<T>: FixedPointConvert,
 	{
 		pub fn account_id() -> T::AccountId {
-			MINING_PALLETID.into_account()
+			MINING_PALLETID.into_account_truncating()
 		}
 
 		fn heartbeat_challenge() {

diff --git a/scripts/debug-cli/src/main.rs b/scripts/debug-cli/src/main.rs
@@ -189,7 +189,7 @@ async fn main() {
             use sp_runtime::traits::AccountIdConversion;
             let pallet_id_array: [u8; 8] = pallet_id.as_bytes().try_into().expect("Bad length");
             let id = frame_support::PalletId(pallet_id_array);
-            let account: AccountId = id.into_account();
+            let account: AccountId = id.into_account_truncating();
             println!("Pallet account: {}", account);
         }
         Cli::Rpc { url, command } => {