From 6f1c61ce2727fdadf07b76cdf6d0547e34841b0d Mon Sep 17 00:00:00 2001 From: ron Date: Fri, 26 Jan 2024 09:16:40 +0800 Subject: [PATCH 1/2] Update sdk with run_to_block_with_finalize --- parachain/Cargo.lock | 77 ++++++++++++------------ parachain/runtime/test-common/src/lib.rs | 28 +++++---- polkadot-sdk | 2 +- 3 files changed, 55 insertions(+), 52 deletions(-) diff --git a/parachain/Cargo.lock b/parachain/Cargo.lock index fd0cdc6780..6eed7f73d9 100644 --- a/parachain/Cargo.lock +++ b/parachain/Cargo.lock @@ -86,7 +86,7 @@ dependencies = [ "rand 0.8.5", "ruint", "serde", - "tiny-keccak 2.0.2", + "tiny-keccak", ] [[package]] @@ -126,7 +126,7 @@ dependencies = [ "quote", "syn 2.0.48", "syn-solidity", - "tiny-keccak 2.0.2", + "tiny-keccak", ] [[package]] @@ -141,15 +141,6 @@ dependencies = [ "serde", ] -[[package]] -name = "amcl" -version = "0.3.0" -source = "git+https://github.com/snowfork/milagro_bls?rev=a6d66e4eb89015e352fb1c9f7b661ecdbb5b2176#a6d66e4eb89015e352fb1c9f7b661ecdbb5b2176" -dependencies = [ - "parity-scale-codec", - "scale-info", -] - [[package]] name = "android-tzdata" version = "0.1.1" @@ -611,6 +602,7 @@ dependencies = [ "pallet-balances", "pallet-collator-selection", "pallet-session", + "pallet-timestamp", "pallet-xcm", "pallet-xcm-bridge-hub-router", "parachains-common", @@ -1065,6 +1057,7 @@ dependencies = [ "pallet-bridge-relayers", "pallet-collator-selection", "pallet-session", + "pallet-timestamp", "pallet-utility", "pallet-xcm", "pallet-xcm-benchmarks", @@ -1331,7 +1324,7 @@ checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" dependencies = [ "getrandom 0.2.11", "once_cell", - "tiny-keccak 2.0.2", + "tiny-keccak", ] [[package]] @@ -2092,11 +2085,12 @@ dependencies = [ [[package]] name = "ethabi-decode" -version = "1.3.3" -source = "git+https://github.com/snowfork/ethabi-decode.git?branch=master#6f63405bb33ef4365a1c62b72d499fa0f448118e" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09d398648d65820a727d6a81e58b962f874473396a047e4c30bafe3240953417" dependencies = [ "ethereum-types", - "tiny-keccak 1.5.0", + "tiny-keccak", ] [[package]] @@ -2111,7 +2105,7 @@ dependencies = [ "impl-rlp", "impl-serde", "scale-info", - "tiny-keccak 2.0.2", + "tiny-keccak", ] [[package]] @@ -3223,20 +3217,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "milagro_bls" -version = "1.5.0" -source = "git+https://github.com/snowfork/milagro_bls?rev=a6d66e4eb89015e352fb1c9f7b661ecdbb5b2176#a6d66e4eb89015e352fb1c9f7b661ecdbb5b2176" -dependencies = [ - "amcl", - "hex", - "lazy_static", - "parity-scale-codec", - "rand 0.8.5", - "scale-info", - "zeroize", -] - [[package]] name = "miniz_oxide" version = "0.6.2" @@ -3990,6 +3970,7 @@ dependencies = [ "pallet-balances", "pallet-collator-selection", "pallet-session", + "pallet-timestamp", "pallet-xcm", "parachains-common", "parity-scale-codec", @@ -5178,6 +5159,16 @@ dependencies = [ "serde", ] +[[package]] +name = "snowbridge-amcl" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "460a9ed63cdf03c1b9847e8a12a5f5ba19c4efd5869e4a737e05be25d7c427e5" +dependencies = [ + "parity-scale-codec", + "scale-info", +] + [[package]] name = "snowbridge-beacon-primitives" version = "0.9.0" @@ -5187,12 +5178,12 @@ dependencies = [ "frame-system", "hex", "hex-literal", - "milagro_bls", "parity-scale-codec", "rlp", "scale-info", "serde", "snowbridge-ethereum", + "snowbridge-milagro-bls", "sp-core", "sp-io", "sp-runtime", @@ -5249,6 +5240,21 @@ dependencies = [ "wasm-bindgen-test", ] +[[package]] +name = "snowbridge-milagro-bls" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "026aa8638f690a53e3f7676024b9e913b1cab0111d1b7b92669d40a188f9d7e6" +dependencies = [ + "hex", + "lazy_static", + "parity-scale-codec", + "rand 0.8.5", + "scale-info", + "snowbridge-amcl", + "zeroize", +] + [[package]] name = "snowbridge-outbound-queue-merkle-tree" version = "0.9.0" @@ -6534,15 +6540,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "tiny-keccak" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d8a021c69bb74a44ccedb824a046447e2c84a01df9e5c20779750acb38e11b2" -dependencies = [ - "crunchy", -] - [[package]] name = "tiny-keccak" version = "2.0.2" diff --git a/parachain/runtime/test-common/src/lib.rs b/parachain/runtime/test-common/src/lib.rs index 2d7787398b..7fb92fa4a4 100644 --- a/parachain/runtime/test-common/src/lib.rs +++ b/parachain/runtime/test-common/src/lib.rs @@ -7,7 +7,6 @@ use frame_support::{ traits::{fungible::Mutate, OnFinalize, OnInitialize}, }; use frame_system::pallet_prelude::BlockNumberFor; -use parachains_common::AccountId; pub use parachains_runtimes_test_utils::test_cases::change_storage_constant_by_governance_works; use parachains_runtimes_test_utils::{ AccountIdOf, BalanceOf, CollatorSessionKeys, ExtBuilder, ValidatorIdOf, XcmReceivedFrom, @@ -126,7 +125,8 @@ pub fn send_transfer_token_message_success> + OnFinalize>, @@ -170,10 +170,10 @@ pub fn send_transfer_token_message_success::block_number(); let next_block_number = block_number.saturating_add(U256::from(1)); - let included_head = RuntimeHelper::::run_to_block( - next_block_number.as_u32(), - AccountId::from(Alice).into(), - ); + let included_head = + RuntimeHelper::::run_to_block_with_finalize( + next_block_number.as_u32(), + ); let origin: ParaId = (assethub_parachain_id as u32).into(); let channel_id: ChannelId = origin.into(); @@ -186,7 +186,9 @@ pub fn send_transfer_token_message_success::digest(); let digest_items = digest.logs(); - assert!(digest_items.len() == 1 && digest_items[0].as_other().is_some()); + assert!( + digest_items.len() > 1 && digest_items[digest_items.len() - 1].as_other().is_some() + ); //assert_eq!(Messages::::decode_len(), Some(4)); }); @@ -206,7 +208,8 @@ pub fn send_unpaid_transfer_token_message( + parachain_info::Config + pallet_collator_selection::Config + cumulus_pallet_parachain_system::Config - + snowbridge_pallet_outbound_queue::Config, + + snowbridge_pallet_outbound_queue::Config + + pallet_timestamp::Config, XcmConfig: xcm_executor::Config, ValidatorIdOf: From>, { @@ -294,7 +297,8 @@ pub fn send_transfer_token_message_failure( + pallet_collator_selection::Config + cumulus_pallet_parachain_system::Config + snowbridge_pallet_outbound_queue::Config - + snowbridge_pallet_system::Config, + + snowbridge_pallet_system::Config + + pallet_timestamp::Config, XcmConfig: xcm_executor::Config, ValidatorIdOf: From>, { @@ -342,7 +346,8 @@ pub fn ethereum_extrinsic( + cumulus_pallet_parachain_system::Config + snowbridge_pallet_outbound_queue::Config + snowbridge_pallet_system::Config - + snowbridge_pallet_ethereum_client::Config, + + snowbridge_pallet_ethereum_client::Config + + pallet_timestamp::Config, ValidatorIdOf: From>, ::RuntimeCall: From>, @@ -423,7 +428,8 @@ pub fn ethereum_to_polkadot_message_extrinsics_work( + cumulus_pallet_parachain_system::Config + snowbridge_pallet_outbound_queue::Config + snowbridge_pallet_system::Config - + snowbridge_pallet_ethereum_client::Config, + + snowbridge_pallet_ethereum_client::Config + + pallet_timestamp::Config, ValidatorIdOf: From>, ::RuntimeCall: From>, diff --git a/polkadot-sdk b/polkadot-sdk index 2afac31693..4d2c7a7fd3 160000 --- a/polkadot-sdk +++ b/polkadot-sdk @@ -1 +1 @@ -Subproject commit 2afac316933a3b031c979af9cb8d1e36f03eccb8 +Subproject commit 4d2c7a7fd32ee418e3cf80f5af582e001d3fbe41 From 2f827b3fa00b4b3760bb1dee11efc6fd5c9c5a0a Mon Sep 17 00:00:00 2001 From: ron Date: Fri, 26 Jan 2024 13:28:01 +0800 Subject: [PATCH 2/2] Update sdk --- polkadot-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/polkadot-sdk b/polkadot-sdk index 4d2c7a7fd3..243fd44e51 160000 --- a/polkadot-sdk +++ b/polkadot-sdk @@ -1 +1 @@ -Subproject commit 4d2c7a7fd32ee418e3cf80f5af582e001d3fbe41 +Subproject commit 243fd44e515ce6e26171a0b9da64c4603a67b18c