Bounties

bin/node/runtime/src/lib.rs

@@ -573,8 +573,13 @@ parameter_types! {
 	pub const TipCountdown: BlockNumber = 1 * DAYS;
 	pub const TipFindersFee: Percent = Percent::from_percent(20);
 	pub const TipReportDepositBase: Balance = 1 * DOLLARS;
-	pub const TipReportDepositPerByte: Balance = 1 * CENTS;
+	pub const DataDepositPerByte: Balance = 1 * CENTS;
+	pub const BountyDepositBase: Balance = 1 * DOLLARS;
+	pub const BountyDepositPayoutDelay: BlockNumber = 1 * DAYS;
 	pub const TreasuryModuleId: ModuleId = ModuleId(*b"py/trsry");
+	pub const BountyDuration: BlockNumber = 14 * DAYS;
+	pub const MaximumReasonLength: u32 = 16384;
+	pub const MaximumSubBountyDepth: u8 = 2;
 }
 
 impl pallet_treasury::Trait for Runtime {
@@ -594,13 +599,18 @@ impl pallet_treasury::Trait for Runtime {
 	type TipCountdown = TipCountdown;
 	type TipFindersFee = TipFindersFee;
 	type TipReportDepositBase = TipReportDepositBase;
-	type TipReportDepositPerByte = TipReportDepositPerByte;
+	type DataDepositPerByte = DataDepositPerByte;
 	type Event = Event;
 	type ProposalRejection = ();
 	type ProposalBond = ProposalBond;
 	type ProposalBondMinimum = ProposalBondMinimum;
 	type SpendPeriod = SpendPeriod;
 	type Burn = Burn;
+	type BountyDepositBase = BountyDepositBase;
+	type BountyDepositPayoutDelay = BountyDepositPayoutDelay;
+	type BountyDuration = BountyDuration;
+	type MaximumReasonLength = MaximumReasonLength;
+	type MaximumSubBountyDepth = MaximumSubBountyDepth;
 	type WeightInfo = ();
 }
 

frame/treasury/Cargo.toml

@@ -41,4 +41,5 @@ std = [
 runtime-benchmarks = [
 	"frame-benchmarking",
 	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
 ]

frame/treasury/src/benchmarking.rs

@@ -47,7 +47,7 @@ fn setup_proposal<T: Trait>(u: u32) -> (
 fn setup_awesome<T: Trait>(length: u32) -> (T::AccountId, Vec<u8>, T::AccountId) {
 	let caller = account("caller", 0, SEED);
 	let value = T::TipReportDepositBase::get()
-		+ T::TipReportDepositPerByte::get() * length.into()
+		+ T::DataDepositPerByte::get() * length.into()
 		+ T::Currency::minimum_balance();
 	let _ = T::Currency::make_free_balance_be(&caller, value);
 	let reason = vec![0; length as usize];
@@ -107,6 +107,77 @@ fn create_approved_proposals<T: Trait>(n: u32) -> Result<(), &'static str> {
 	Ok(())
 }
 
+// Create bounties that are approved for use in `on_initialize`.
+fn create_approved_bounties<T: Trait>(n: u32) -> Result<(), &'static str> {
+	for i in 0 .. n {
+		let (caller, curator_lookup, fee, value, reason) = setup_bounty::<T>(i, MAX_BYTES);
+		Treasury::<T>::propose_bounty(RawOrigin::Signed(caller).into(), curator_lookup.clone(), fee, value, reason)?;
+		let bounty_id = BountyCount::get() - 1;
+		Treasury::<T>::approve_bounty(RawOrigin::Root.into(), bounty_id)?;
+	}
+	ensure!(BountyApprovals::get().len() == n as usize, "Not all bounty approved");
+	Ok(())
+}
+
+// Create the pre-requisite information needed to create a treasury `propose_bounty`.
+fn setup_bounty<T: Trait>(u: u32, r: u32) -> (
+	T::AccountId,
+	<T::Lookup as StaticLookup>::Source,
+	BalanceOf<T>,
+	BalanceOf<T>,
+	Vec<u8>,
+) {
+	let caller = account("caller", u, SEED);
+	let value: BalanceOf<T> = T::Currency::minimum_balance().saturating_mul(100.into());
+	let fee = T::Currency::minimum_balance().saturating_mul(2.into());
+	let deposit = T::BountyDepositBase::get() + T::DataDepositPerByte::get() * MAX_BYTES.into();
+	let _ = T::Currency::make_free_balance_be(&caller, deposit);
+	let curator = account("curator", u, SEED);
+	let curator_lookup = T::Lookup::unlookup(curator);
+	let reason = vec![0; r as usize];
+	(caller, curator_lookup, fee, value, reason)
+}
+
+fn create_bounty<T: Trait>(u: u32) -> Result<(
+	<T::Lookup as StaticLookup>::Source,
+	BountyIndex,
+), &'static str> {
+	let (caller, curator_lookup, fee, value, reason) = setup_bounty::<T>(u, MAX_BYTES);
+	Treasury::<T>::propose_bounty(RawOrigin::Signed(caller).into(), curator_lookup.clone(), fee, value, reason)?;
+	let bounty_id = BountyCount::get() - 1;
+	Treasury::<T>::approve_bounty(RawOrigin::Root.into(), bounty_id)?;
+	Treasury::<T>::on_initialize(T::BlockNumber::zero());
+	Ok((curator_lookup, bounty_id))
+}
+
+fn setup_pod_account<T: Trait>() {
+	let pot_account = Treasury::<T>::account_id();
+	let value = T::Currency::minimum_balance().saturating_mul(1_000_000_000.into());
+	let _ = T::Currency::make_free_balance_be(&pot_account, value);
+}
+
+fn setup_sub_bounty<T: Trait>(u: u32, r: u32) -> Result<(
+	T::AccountId,
+	<T::Lookup as StaticLookup>::Source,
+	BalanceOf<T>,
+	BalanceOf<T>,
+	Vec<u8>,
+), &'static str> {
+	create_bounty::<T>(u)?;
+	setup_pod_account::<T>();
+	Treasury::<T>::on_initialize(T::BlockNumber::zero());
+
+	let caller = account("curator", u, SEED);
+	let value: BalanceOf<T> = T::Currency::minimum_balance().saturating_mul(50.into());
+	let fee = T::Currency::minimum_balance();
+	let deposit = T::BountyDepositBase::get() + T::DataDepositPerByte::get() * MAX_BYTES.into();
+	let _ = T::Currency::make_free_balance_be(&caller, deposit);
+	let curator = account("curator2", u, SEED);
+	let curator_lookup = T::Lookup::unlookup(curator);
+	let reason = vec![0; r as usize];
+	Ok((caller, curator_lookup, fee, value, reason))
+}
+
 const MAX_BYTES: u32 = 16384;
 const MAX_TIPPERS: u32 = 100;
 
@@ -185,9 +256,7 @@ benchmarks! {
 		let t in 1 .. MAX_TIPPERS;
 
 		// Make sure pot is funded
-		let pot_account = Treasury::<T>::account_id();
-		let value = T::Currency::minimum_balance().saturating_mul(1_000_000_000.into());
-		let _ = T::Currency::make_free_balance_be(&pot_account, value);
+		setup_pod_account::<T>();
 
 		// Set up a new tip proposal
 		let (member, reason, beneficiary, value) = setup_tip::<T>(0, t)?;
@@ -208,12 +277,99 @@ benchmarks! {
 		let caller = account("caller", t, SEED);
 	}: _(RawOrigin::Signed(caller), hash)
 
+	propose_bounty {
+		let u in 0 .. 1000;
+		let r in 0 .. MAX_BYTES;
+
+		let (caller, curator_lookup, fee, value, reason) = setup_bounty::<T>(u, r);
+	}: _(RawOrigin::Signed(caller), curator_lookup, fee, value, reason)
+
+	create_sub_bounty {
+		let u in 0 .. 1000;
+		let r in 0 .. MAX_BYTES;
+
+		let (caller, curator_lookup, fee, value, reason) = setup_sub_bounty::<T>(u, r)?;
+		let bounty_id = BountyCount::get() - 1;
+
+	}: _(RawOrigin::Signed(caller), bounty_id, curator_lookup, fee, value, reason)
+
+	approve_bounty {
+		let u in 0 .. 1000;
+
+		let (caller, curator_lookup, fee, value, reason) = setup_bounty::<T>(u, MAX_BYTES);
+		Treasury::<T>::propose_bounty(RawOrigin::Signed(caller).into(), curator_lookup, fee, value, reason)?;
+		let bounty_id = BountyCount::get() - 1;
+	}: _(RawOrigin::Root, bounty_id)
+
+	reject_bounty {
+		let u in 0 .. 1000;
+
+		let (caller, curator_lookup, fee, value, reason) = setup_bounty::<T>(u, MAX_BYTES);
+		Treasury::<T>::propose_bounty(RawOrigin::Signed(caller).into(), curator_lookup, fee, value, reason)?;
+		let bounty_id = BountyCount::get() - 1;
+	}: _(RawOrigin::Root, bounty_id)
+
+	award_bounty {
+		let u in 0 .. 1000;
+
+		let (curator_lookup, bounty_id) = create_bounty::<T>(u)?;
+		setup_pod_account::<T>();
+		Treasury::<T>::on_initialize(T::BlockNumber::zero());
+
+		let bounty_id = BountyCount::get() - 1;
+		let curator = T::Lookup::lookup(curator_lookup)?;
+		let beneficiary = T::Lookup::unlookup(account("beneficiary", u, SEED));
+	}: _(RawOrigin::Signed(curator), bounty_id, beneficiary)
+
+	claim_bounty {
+		let u in 0 .. 1000;
+
+		let (curator_lookup, bounty_id) = create_bounty::<T>(u)?;
+		setup_pod_account::<T>();
+		Treasury::<T>::on_initialize(T::BlockNumber::zero());
+
+		let bounty_id = BountyCount::get() - 1;
+		let curator = T::Lookup::lookup(curator_lookup)?;
+
+		let beneficiary = T::Lookup::unlookup(account("beneficiary", u, SEED));
+		Treasury::<T>::award_bounty(RawOrigin::Signed(curator.clone()).into(), bounty_id, beneficiary)?;
+
+		frame_system::Module::<T>::set_block_number(T::BountyDepositPayoutDelay::get());
+
+	}: _(RawOrigin::Signed(curator), bounty_id)
+
+	cancel_bounty {
+		let u in 0 .. 1000;
+
+		let (curator_lookup, bounty_id) = create_bounty::<T>(u)?;
+		setup_pod_account::<T>();
+		Treasury::<T>::on_initialize(T::BlockNumber::zero());
+
+		let bounty_id = BountyCount::get() - 1;
+		let curator = T::Lookup::lookup(curator_lookup)?;
+	}: _(RawOrigin::Signed(curator), bounty_id)
+
+	extend_bounty_expiry {
+		let u in 0 .. 1000;
+
+		let (curator_lookup, bounty_id) = create_bounty::<T>(u)?;
+		setup_pod_account::<T>();
+		Treasury::<T>::on_initialize(T::BlockNumber::zero());
+
+		let bounty_id = BountyCount::get() - 1;
+		let curator = T::Lookup::lookup(curator_lookup)?;
+	}: _(RawOrigin::Signed(curator), bounty_id)
+
+	update_bounty_value_minimum {
+
+	}: _(RawOrigin::Root, 100.into())
+
 	on_initialize {
 		let p in 0 .. 100;
-		let pot_account = Treasury::<T>::account_id();
-		let value = T::Currency::minimum_balance().saturating_mul(1_000_000_000.into());
-		let _ = T::Currency::make_free_balance_be(&pot_account, value);
+		let q in 0 .. 100;
+		setup_pod_account::<T>();
 		create_approved_proposals::<T>(p)?;
+		create_approved_bounties::<T>(q)?;
 	}: {
 		Treasury::<T>::on_initialize(T::BlockNumber::zero());
 	}
@@ -236,6 +392,15 @@ mod tests {
 			assert_ok!(test_benchmark_tip_new::<Test>());
 			assert_ok!(test_benchmark_tip::<Test>());
 			assert_ok!(test_benchmark_close_tip::<Test>());
+			assert_ok!(test_benchmark_propose_bounty::<Test>());
+			assert_ok!(test_benchmark_create_sub_bounty::<Test>());
+			assert_ok!(test_benchmark_approve_bounty::<Test>());
+			assert_ok!(test_benchmark_reject_bounty::<Test>());
+			assert_ok!(test_benchmark_award_bounty::<Test>());
+			assert_ok!(test_benchmark_claim_bounty::<Test>());
+			assert_ok!(test_benchmark_cancel_bounty::<Test>());
+			assert_ok!(test_benchmark_extend_bounty_expiry::<Test>());
+			assert_ok!(test_benchmark_update_bounty_value_minimum::<Test>());
 			assert_ok!(test_benchmark_on_initialize::<Test>());
 		});
 	}