Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Enable Offchain Equalise #5683

Merged
gavofyork merged 13 commits into from
Apr 27, 2020
Merged

Enable Offchain Equalise #5683

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f579912
Master.into()
kianenigma Apr 2, 2020
cb40663
Remove debug stuff
kianenigma Apr 17, 2020
f95d7aa
Better license
kianenigma Apr 17, 2020
dbdd27f
Migrate away from SimpleDispatchInfo
kianenigma Apr 17, 2020
63a08fb
Merge branch 'master' of github.com:paritytech/substrate into kiz-ena…
kianenigma Apr 17, 2020
99db05f
Merge branch 'kiz-enable-equialize-offchain-2' of github.com:parityte…
kianenigma Apr 17, 2020
394df29
Fix test
kianenigma Apr 17, 2020
f478d8a
Revert "Migrate away from SimpleDispatchInfo"
kianenigma Apr 20, 2020
031b3a3
Master.into()
kianenigma Apr 22, 2020
4831653
Move to offchain randomness
kianenigma Apr 27, 2020
c82f3f7
Merge branch 'master' of github.com:paritytech/substrate into kiz-ena…
kianenigma Apr 27, 2020
6780b60
Fix tests
kianenigma Apr 27, 2020
df1a7b5
Fix tests more
kianenigma Apr 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Master.into()
  • Loading branch information
@kianenigma
kianenigma committed Apr 22, 2020
commit 031b3a37be0fbec7022673b91c46f620fbc028e3
1 change: 0 additions & 1 deletion bin/node/runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,6 @@ impl pallet_staking::Trait for Runtime {
type NextNewSession = Session;
type ElectionLookahead = ElectionLookahead;
type Call = Call;
type SubmitTransaction = TransactionSubmitterOf<()>;
type Randomness = RandomnessCollectiveFlip;
Copy link
Member

@bkchr bkchr Apr 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not Babe?

Copy link
Contributor Author

@kianenigma kianenigma Apr 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ow I didn't know Babe also implements it. What are the differences? I don't think the randomness that Staking needs is in any sense consensus critical.

Copy link
Member

@bkchr bkchr Apr 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Babe provides "real" randomness, while the one provided by collective flip is based on the last 80? block hashes.

Copy link
Member

@gavofyork gavofyork Apr 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

isn't there a local (non-deterministic) rand() function for offchain workers?

Copy link
Member

@bkchr bkchr Apr 27, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah.

Copy link
Contributor Author

@kianenigma kianenigma Apr 27, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll switch to that then 👍

type MaxIterations = MaxIterations;
type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
Expand Down
13 changes: 7 additions & 6 deletions frame/staking/fuzzer/src/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,13 @@ parameter_types! {
}

pub type Extrinsic = sp_runtime::testing::TestXt<Call, ()>;
type SubmitTransaction = frame_system::offchain::TransactionSubmitter<
sp_runtime::testing::UintAuthorityId,
Test,
Extrinsic,
>;

impl<C> frame_system::offchain::SendTransactionTypes<C> for Test where
Call: From<C>,
{
type OverarchingCall = Call;
type Extrinsic = Extrinsic;
}

impl pallet_staking::Trait for Test {
type Currency = Balances;
Expand All @@ -189,7 +191,6 @@ impl pallet_staking::Trait for Test {
type NextNewSession = Session;
type ElectionLookahead = ();
type Call = Call;
type SubmitTransaction = SubmitTransaction;
type MaxIterations = MaxIterations;
type Randomness = StaticRandomness;
type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
Expand Down
3 changes: 0 additions & 3 deletions frame/staking/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,9 +804,6 @@ pub trait Trait: frame_system::Trait + SendTransactionTypes<Call<Self>> {
/// The overarching call type.
type Call: Dispatchable + From<Call<Self>> + IsSubType<Module<Self>, Self> + Clone;

/// A transaction submitter.
type SubmitTransaction: SubmitUnsignedTransaction<Self, <Self as Trait>::Call>;

/// Something that can provide randomness
type Randomness: Randomness<Self::Hash>;

Expand Down
1 change: 0 additions & 1 deletion frame/staking/src/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,6 @@ impl Trait for Test {
type NextNewSession = Session;
type ElectionLookahead = ElectionLookahead;
type Call = Call;
type SubmitTransaction = SubmitTransaction;
type Randomness = StaticRandomness;
type MaxIterations = MaxIterations;
type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.