Task(bump) Pallet Salary #5163

Doordashcon · 2024-07-27T12:32:49Z

Resolves #4545

Blocked on #5194

paritytech-cicd-pr · 2024-08-21T00:47:15Z

The CI pipeline was cancelled due to failure one of the required jobs.
Job name: test-linux-stable-int
Logs: https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/7086050

gupnik

Thank you for taking this up!

gupnik · 2024-11-08T10:26:15Z

substrate/frame/salary/src/tests/unit.rs

@@ -146,6 +165,7 @@ parameter_types! {
 }

 impl Config for Test {


Can we use derive_impl here?

not sure if we need to

gupnik · 2024-11-08T10:26:51Z

substrate/frame/salary/src/lib.rs

+
+	#[pallet::hooks]
+	impl<T: Config<I>, I: 'static> Hooks<BlockNumberFor<T>> for Pallet<T, I> {
+		#[cfg(feature = "experimental")]


I think we can remove experimental now and get this audited. Thoughts @kianenigma @ggwpez ?

gui1117

Looks good, some comments

gui1117 · 2024-11-13T02:49:23Z

cumulus/parachains/runtimes/collectives/collectives-westend/Cargo.toml

@@ -247,6 +249,10 @@ std = [
 	"xcm/std",
 ]

+experimental = [
+	"pallet-salary/experimental",
+]


Maybe we should use experimental by default for the westend testnet.

gui1117 · 2024-11-13T02:53:08Z

substrate/frame/salary/src/lib.rs

+	pub trait Config<I: 'static = ()>:
+		CreateInherent<frame_system::Call<Self>> + frame_system::Config
+	{
+		type RuntimeTask: frame_support::traits::Task
+			+ IsType<<Self as frame_system::Config>::RuntimeTask>
+			+ From<Task<Self, I>>;


You don't need this new associated type. Instead you can bound From<Task<..>> directly in the supertrait bound:

Suggested change

pub trait Config<I: 'static = ()>:

CreateInherent<frame_system::Call<Self>> + frame_system::Config

{

type RuntimeTask: frame_support::traits::Task

+ IsType<<Self as frame_system::Config>::RuntimeTask>

+ From<Task<Self, I>>;

pub trait Config<I: 'static = ()>:

CreateInherent<frame_system::Call<Self>> + frame_system::Config<RuntimeTask: From<Task<Self, I>>>

{

gui1117 · 2024-11-13T03:02:49Z

substrate/frame/salary/src/lib.rs

+			match res {
+				Ok(_) => log::info!(target: LOG_TARGET, "Submitted the task."),
+				Err(e) => log::error!(target: LOG_TARGET, "Error submitting task: {:?}", e),
+			}


So every block we try to submit the task?

Is submitting a transaction so cheap? Maybe we should at least verify the task condition before trying to submit it.

maybe we can use the task list here.

gui1117 · 2024-11-13T03:06:50Z

substrate/frame/salary/src/lib.rs

@@ -382,6 +394,54 @@ pub mod pallet {
 		}
 	}

+	#[pallet::tasks_experimental]
+	impl<T: Config<I>, I: 'static> Pallet<T, I> {
+		#[pallet::task_list(vec![].into_iter())]


we could have an actual task list: return a vector with one element () if now >= startus.cycle_start+cycle_period, no?

gui1117 · 2024-11-13T03:08:56Z

substrate/frame/salary/src/lib.rs

+		#[pallet::task_condition(|| {
+			let now = frame_system::Pallet::<T>::block_number();
+			let cycle_period = Pallet::<T, I>::cycle_period();
+			let mut status = Status::<T, I>::get().unwrap();


I don't think we want to unwrap here. we should return false:

Suggested change

let mut status = Status::<T, I>::get().unwrap();

let Some(mut status) = Status::<T, I>::get() else { return false };

gui1117 · 2024-11-13T03:19:53Z

prdoc/pr_5163.prdoc

+    - name: staging-xcm-builder
+      bump: patch
+    - name: pallet-salary
+      bump: patch


The bounding of CreateInherent breaks semver.

Suggested change

bump: patch

bump: major

gui1117 · 2024-11-13T03:21:26Z

polkadot/xcm/xcm-builder/Cargo.toml

+	"frame-support/experimental", 
+	"frame-system/experimental",
+	"pallet-salary/experimental",
+]


why do we need this new feature?

gui1117 · 2024-11-13T03:22:43Z

cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs

@@ -741,7 +835,8 @@ pub type TxExtension = (
 	frame_system::CheckEra<Runtime>,
 	frame_system::CheckNonce<Runtime>,
 	frame_system::CheckWeight<Runtime>,
-	cumulus_primitives_storage_weight_reclaim::StorageWeightReclaim<Runtime>,
+	pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
+	frame_metadata_hash_extension::CheckMetadataHash<Runtime>,


Is this needed? I understand it is better to have it. But I am afraid it breaks stuff.

gui1117 · 2024-11-13T03:25:28Z

cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs

+pub type SignedPayload = generic::SignedPayload<RuntimeCall, TxExtension>;
+
+impl frame_system::offchain::SigningTypes for Runtime {
+	type Public = <Signature as Verify>::Signer;
+	type Signature = Signature;
+}


This is not needed no?

Suggested change

pub type SignedPayload = generic::SignedPayload<RuntimeCall, TxExtension>;

impl frame_system::offchain::SigningTypes for Runtime {

type Public = <Signature as Verify>::Signer;

type Signature = Signature;

}

gui1117 · 2024-11-13T03:25:50Z

cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs

+/// Submits a transaction with the node's public and signature type. Adheres to the signed extension
+/// format of the chain.
+impl<LocalCall> frame_system::offchain::CreateSignedTransaction<LocalCall> for Runtime
+where
+	RuntimeCall: From<LocalCall>,
+{
+	fn create_signed_transaction<
+		C: frame_system::offchain::AppCrypto<Self::Public, Self::Signature>,
+	>(
+		call: RuntimeCall,
+		public: <Signature as Verify>::Signer,
+		account: AccountId,
+		nonce: <Runtime as frame_system::Config>::Nonce,
+	) -> Option<UncheckedExtrinsic> {
+		use sp_runtime::traits::StaticLookup;
+		// take the biggest period possible.
+		let period =
+			BlockHashCount::get().checked_next_power_of_two().map(|c| c / 2).unwrap_or(2) as u64;
+
+		let current_block = System::block_number()
+			.saturated_into::<u64>()
+			// The `System::block_number` is initialized with `n+1`,
+			// so the actual block number is `n`.
+			.saturating_sub(1);
+		let tip = 0;
+		let tx_ext: TxExtension = (
+			frame_system::CheckNonZeroSender::<Runtime>::new(),
+			frame_system::CheckSpecVersion::<Runtime>::new(),
+			frame_system::CheckTxVersion::<Runtime>::new(),
+			frame_system::CheckGenesis::<Runtime>::new(),
+			frame_system::CheckMortality::<Runtime>::from(generic::Era::mortal(
+				period,
+				current_block,
+			)),
+			frame_system::CheckNonce::<Runtime>::from(nonce),
+			frame_system::CheckWeight::<Runtime>::new(),
+			pallet_transaction_payment::ChargeTransactionPayment::<Runtime>::from(tip),
+			frame_metadata_hash_extension::CheckMetadataHash::<Runtime>::new(true),
+		)
+			.into();
+		let raw_payload = SignedPayload::new(call, tx_ext)
+			.map_err(|e| {
+				log::warn!("Unable to create signed payload: {:?}", e);
+			})
+			.ok()?;
+		let signature = raw_payload.using_encoded(|payload| C::sign(payload, public))?;
+		let (call, tx_ext, _) = raw_payload.deconstruct();
+		let address = <Runtime as frame_system::Config>::Lookup::unlookup(account);
+		let transaction = UncheckedExtrinsic::new_signed(call, address, signature, tx_ext);
+		Some(transaction)
+	}
+}
+


This is not needed no?

Suggested change

/// Submits a transaction with the node's public and signature type. Adheres to the signed extension

/// format of the chain.

impl<LocalCall> frame_system::offchain::CreateSignedTransaction<LocalCall> for Runtime

where

RuntimeCall: From<LocalCall>,

{

fn create_signed_transaction<

C: frame_system::offchain::AppCrypto<Self::Public, Self::Signature>,

>(

call: RuntimeCall,

public: <Signature as Verify>::Signer,

account: AccountId,

nonce: <Runtime as frame_system::Config>::Nonce,

) -> Option<UncheckedExtrinsic> {

use sp_runtime::traits::StaticLookup;

// take the biggest period possible.

let period =

BlockHashCount::get().checked_next_power_of_two().map(|c| c / 2).unwrap_or(2) as u64;

let current_block = System::block_number()

.saturated_into::<u64>()

// The `System::block_number` is initialized with `n+1`,

// so the actual block number is `n`.

.saturating_sub(1);

let tip = 0;

let tx_ext: TxExtension = (

frame_system::CheckNonZeroSender::<Runtime>::new(),

frame_system::CheckSpecVersion::<Runtime>::new(),

frame_system::CheckTxVersion::<Runtime>::new(),

frame_system::CheckGenesis::<Runtime>::new(),

frame_system::CheckMortality::<Runtime>::from(generic::Era::mortal(

period,

current_block,

)),

frame_system::CheckNonce::<Runtime>::from(nonce),

frame_system::CheckWeight::<Runtime>::new(),

pallet_transaction_payment::ChargeTransactionPayment::<Runtime>::from(tip),

frame_metadata_hash_extension::CheckMetadataHash::<Runtime>::new(true),

)

.into();

let raw_payload = SignedPayload::new(call, tx_ext)

.map_err(|e| {

log::warn!("Unable to create signed payload: {:?}", e);

})

.ok()?;

let signature = raw_payload.using_encoded(|payload| C::sign(payload, public))?;

let (call, tx_ext, _) = raw_payload.deconstruct();

let address = <Runtime as frame_system::Config>::Lookup::unlookup(account);

let transaction = UncheckedExtrinsic::new_signed(call, address, signature, tx_ext);

Some(transaction)

}

}

Doordashcon added 3 commits July 27, 2024 13:31

bump_offchain task

85b653c

Merge branch 'master' into ddc-salary-hook

c9f3b1a

add SendTransactionTypes Config in Tests

3ee2ad4

Doordashcon added 5 commits October 30, 2024 00:09

Merge branch 'master' into ddc-salary-hook

c569428

hacking the execution pattern

1ca440d

needed tests

dbcabbd

collectives::pallet_salary

55700e7

Merge branch 'master' into ddc-salary-hook

8547bee

Doordashcon marked this pull request as ready for review November 7, 2024 21:54

Doordashcon requested a review from a team as a code owner November 7, 2024 21:54

pallet-salary/experimental, umbrella

13b3e97

gupnik reviewed Nov 8, 2024

View reviewed changes

xcm-builder support

91f42d2

Doordashcon requested a review from a team as a code owner November 8, 2024 17:10

paritytech-review-bot bot requested a review from a team November 8, 2024 17:11

Doordashcon added 9 commits November 12, 2024 04:34

add benchmarks

650e6bb

Merge branch 'master' into ddc-salary-hook

3cab4d2

remove umbrella crate from pr_5163.prdoc

d108f47

fix benchmark

1f9de5a

cargo +nightly fmt

14fd341

cargo +nightly fmt

a929126

adjust prdoc version bumps

ccea799

adjust prdoc version bumps 2

ad6380b

add polkadot-sdk to prdoc

c206b30

gui1117 reviewed Nov 13, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Task(bump) Pallet Salary #5163

Task(bump) Pallet Salary #5163

Doordashcon commented Jul 27, 2024 •

edited

Loading

paritytech-cicd-pr commented Aug 21, 2024

gupnik left a comment

gupnik Nov 8, 2024

Doordashcon Nov 8, 2024

gupnik Nov 8, 2024

gui1117 left a comment

gui1117 Nov 13, 2024

gui1117 Nov 13, 2024

gui1117 Nov 13, 2024

gui1117 Nov 13, 2024

gui1117 Nov 13, 2024

gui1117 Nov 13, 2024

gui1117 Nov 13, 2024

gui1117 Nov 13, 2024

gui1117 Nov 13, 2024

gui1117 Nov 13, 2024

		@@ -146,6 +165,7 @@ parameter_types! {
		}

		impl Config for Test {

	let mut status = Status::<T, I>::get().unwrap();
	let Some(mut status) = Status::<T, I>::get() else { return false };

Task(bump) Pallet Salary #5163

Are you sure you want to change the base?

Task(bump) Pallet Salary #5163

Conversation

Doordashcon commented Jul 27, 2024 • edited Loading

paritytech-cicd-pr commented Aug 21, 2024

gupnik left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gui1117 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Doordashcon commented Jul 27, 2024 •

edited

Loading