merge uplift-sdk-v1.5 & fix conflicts

Author: ermalkaleci

Cargo.lock

@@ -85,12 +85,6 @@ $ curl -H 'Content-Type: application/json' --data '{ "jsonrpc":"2.0", "method":"
 After this step, you should have a validator node online with a session key for your node.
 For key management and validator rewards, consult our [validator guide online](https://docs.astar.network/build/validator-guide/configure-node).
 
-## Run RPC Tests
-
-RPC tests suite can be run for any release. To run tests go to <https://github.com/AstarNetwork/Astar/actions/workflows/rpcTest.yml>. Click Run workflow, in the dropdown input the release version tag you want to run the test suite. Then click the green Run workflow button to start the test suite.
-
-![Screenshot from 2022-07-07 15-28-46](https://user-images.githubusercontent.com/874046/177785570-330c6613-237d-4190-bfed-69876209daf6.png)
-
 ## Workspace Dependency Handling
 
 All dependencies should be listed inside the workspace's root `Cargo.toml` file.

README.md

@@ -98,11 +98,11 @@ shiden-runtime = { workspace = true, features = ["std"] }
 astar-primitives = { workspace = true }
 
 # frame dependencies
+frame-metadata-hash-extension = { workspace = true }
 frame-system = { workspace = true, features = ["std"] }
 pallet-transaction-payment = { workspace = true, features = ["std"] }
 pallet-transaction-payment-rpc = { workspace = true }
 substrate-frame-rpc-system = { workspace = true }
-frame-metadata-hash-extension = { workspace = true }
 
 # CLI-specific dependencies
 sc-cli = { workspace = true, optional = true }
@@ -179,6 +179,7 @@ runtime-benchmarks = [
 	"sc-client-db/runtime-benchmarks",
 	"sc-service/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
+	"cumulus-primitives-core/runtime-benchmarks",
 ]
 cli = ["try-runtime-cli"]
 try-runtime = [

bin/collator/Cargo.toml

@@ -222,7 +222,7 @@ where
             frame_system::CheckNonce::<runtime::Runtime>::from(nonce),
             frame_system::CheckWeight::<runtime::Runtime>::new(),
             pallet_transaction_payment::ChargeTransactionPayment::<runtime::Runtime>::from(0),
-            frame_metadata_hash_extension::CheckMetadataHash::<runtime::Runtime>::new(false)
+            frame_metadata_hash_extension::CheckMetadataHash::<runtime::Runtime>::new(false),
         );
 
         let payload = runtime::SignedPayload::from_raw(
@@ -281,7 +281,7 @@ where
             frame_system::CheckNonce::<runtime::Runtime>::from(nonce),
             frame_system::CheckWeight::<runtime::Runtime>::new(),
             pallet_transaction_payment::ChargeTransactionPayment::<runtime::Runtime>::from(0),
-            frame_metadata_hash_extension::CheckMetadataHash::<runtime::Runtime>::new(false)
+            frame_metadata_hash_extension::CheckMetadataHash::<runtime::Runtime>::new(false),
         );
 
         let payload = runtime::SignedPayload::from_raw(
@@ -340,7 +340,7 @@ where
             frame_system::CheckNonce::<runtime::Runtime>::from(nonce),
             frame_system::CheckWeight::<runtime::Runtime>::new(),
             pallet_transaction_payment::ChargeTransactionPayment::<runtime::Runtime>::from(0),
-            frame_metadata_hash_extension::CheckMetadataHash::<runtime::Runtime>::new(false)
+            frame_metadata_hash_extension::CheckMetadataHash::<runtime::Runtime>::new(false),
         );
 
         let payload = runtime::SignedPayload::from_raw(
@@ -399,7 +399,7 @@ where
             frame_system::CheckNonce::<runtime::Runtime>::from(nonce),
             frame_system::CheckWeight::<runtime::Runtime>::new(),
             pallet_transaction_payment::ChargeTransactionPayment::<runtime::Runtime>::from(0),
-            frame_metadata_hash_extension::CheckMetadataHash::<runtime::Runtime>::new(false)
+            frame_metadata_hash_extension::CheckMetadataHash::<runtime::Runtime>::new(false),
         );
 
         let payload = runtime::SignedPayload::from_raw(

bin/collator/src/benchmarking.rs

@@ -20,10 +20,10 @@
 
 use local_runtime::{
     wasm_binary_unwrap, AccountId, AuraConfig, AuraId, BalancesConfig,
-    CommunityCouncilMembershipConfig, CouncilMembershipConfig, DappStakingConfig, EVMConfig,
-    GrandpaConfig, GrandpaId, InflationConfig, InflationParameters, Precompiles,
-    RuntimeGenesisConfig, Signature, SudoConfig, TechnicalCommitteeMembershipConfig, TierThreshold,
-    VestingConfig, AST,
+    CommunityCouncilMembershipConfig, CommunityTreasuryPalletId, CouncilMembershipConfig,
+    DappStakingConfig, EVMConfig, GrandpaConfig, GrandpaId, InflationConfig, InflationParameters,
+    Precompiles, RuntimeGenesisConfig, Signature, SudoConfig, TechnicalCommitteeMembershipConfig,
+    TierThreshold, TreasuryPalletId, VestingConfig, AST,
 };
 use sc_service::ChainType;
 use sp_core::{crypto::Ss58Codec, sr25519, Pair, Public};
@@ -77,6 +77,8 @@ pub fn development_config() -> ChainSpec {
                 get_account_id_from_seed::<sr25519::Public>("Charlie"),
                 get_account_id_from_seed::<sr25519::Public>("Eve"),
                 get_account_id_from_seed::<sr25519::Public>("Ferdie"),
+                TreasuryPalletId::get().into_account_truncating(),
+                CommunityTreasuryPalletId::get().into_account_truncating(),
                 // Arrakis.TEST account in MetaMask
                 // Import known test account with private key
                 // 0x01ab6e801c06e59ca97a14fc0a1978b27fa366fc87450e0b65459dd3515b7391
@@ -210,6 +212,7 @@ fn testnet_genesis(
         treasury: Default::default(),
         community_treasury: Default::default(),
     };
+
     serde_json::to_value(&config).expect("Could not build genesis config.")
 }
 

bin/collator/src/local/chain_spec.rs

@@ -243,6 +243,7 @@ fn make_genesis(
         treasury: Default::default(),
         community_treasury: Default::default(),
     };
+
     serde_json::to_value(&config).expect("Could not build genesis config.")
 }
 

bin/collator/src/parachain/chain_spec/shibuya.rs

@@ -195,6 +195,25 @@ benchmarks! {
         assert_last_event::<T>(Event::CandidateRemoved(leaving).into());
     }
 
+    withdraw_bond {
+        use frame_support::traits::{EstimateNextSessionRotation, Hooks};
+
+        <CandidacyBond<T>>::put(T::Currency::minimum_balance());
+        <DesiredCandidates<T>>::put(T::MinCandidates::get() + 1);
+        register_validators::<T>(T::MinCandidates::get() + 1);
+        register_candidates::<T>(T::MinCandidates::get() + 1);
+
+        let leaving = <Candidates<T>>::get().last().unwrap().who.clone();
+        whitelist!(leaving);
+        assert_ok!(CollatorSelection::<T>::leave_intent(RawOrigin::Signed(leaving.clone()).into()));
+        let session_length = <T as session::Config>::NextSessionRotation::average_session_length();
+        session::Pallet::<T>::on_initialize(session_length);
+        assert_eq!(<NonCandidates<T>>::get(&leaving), (1u32, T::Currency::minimum_balance()));
+    }: _(RawOrigin::Signed(leaving.clone()))
+    verify {
+        assert_eq!(<NonCandidates<T>>::get(&leaving), (0u32, BalanceOf::<T>::default()));
+    }
+
     // worse case is paying a non-existing candidate account.
     note_author {
         <CandidacyBond<T>>::put(T::Currency::minimum_balance());