mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-05-30 05:51:02 +00:00
Decouple Staking and Election - Part 3: Signed Phase (#7910)
* Base features and traits.
* pallet and unsigned phase
* add signed phase.
* remove comments
* Undo bad formattings.
* some formatting cleanup.
* Small self-cleanup.
* Add todo
* Make it all build
* self-review
* Some doc tests.
* Some changes from other PR
* Fix session test
* Update bin/node/runtime/src/lib.rs
Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
* Fix name.
* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_election_provider_multi_phase --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/election-provider-multi-phase/src/weights.rs --template=./.maintain/frame-weight-template.hbs
* typos and verbiage
* no glob imports in signed.rs
* meaningful generic type parameters for SignedSubmission
* dedup feasibility check weight calculation
* simplify/optimize fn insert_submission
* tests: remove glob, cause to build without error
* use sp_std::vec::Vec
* maintain invariant within fn insert_submission
* fix accidentally ordering the list backward
* intentionally order the list in reverse
* get rid of unused import
* ensure signed submissions are cleared in early elect
* finalize the signed phase when appropriate
- ensure we don't leave storage lying around, even if elect called prematurely
- test that proposition
- disable the unsigned phase if a viable solution from the signed phase exists
- ensure signed phase finalization weight is accounted for
* resolve dispatch error todo
* update assumptions in submit benchmark
* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_election_provider_multi_phase --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/election-provider-multi-phase/src/weights.rs --template=./.maintain/frame-weight-template.hbs
* line length
* make a few more things pub
* restore missing import
* update ui test output
* update tests from master branch
* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_election_provider_multi_phase --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/election-provider-multi-phase/src/weights.rs --template=./.maintain/frame-weight-template.hbs
* remove duplicate definitions
* remove signed reward factor due to its attack potential
* Update frame/election-provider-multi-phase/src/signed.rs
Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
* remove SignedRewardMax; no longer necessary
* compute the encoded size without actually encoding
* remove unused PostInfo
* pub use some stuff
Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
* ensure `pub use` things are in fact `pub`
* add event information: was another solution ejected to make room
* unconditionally run the unsigned phase even if signed was successful
* remove dead test code
* meaningful witness data name
* use errors instead of defensive `unwrap_or_default`
* get rid of a log message redundant with an event
* saturating math
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
* import Saturating
* mv `fn submit` to end of call
* add log line
* Use a better data structure for SignedSubmissions instead of Vec (#8933)
* Remove: (#8748)
* `NetworkStatusSinks`
* `sc_service::SpawnTasksParams::network_status_sinks`
Also:
* `sc_service::build_network()` does not return `network_status_sinks`
* CI: fix simnet trigger (#8927)
* CI: chore
* CI: pin simnet version
* More sc-service config reexports (#8887)
* Reexport ExecutionStrategies and ExecutionStrategy
* Reexport more of the network
* Reexport the ExecutionStrategy as it's used within ExecutionStrategies
* Fix check runtime CI (#8930)
* Fix check_runtime.sh script
* contracts: Remove confusing "Related Modules" doc
* Bump parity-wasm and pwasm-utils to the newest versions everywhere (#8928)
* BROKEN: convert SignedSubmissions to BoundedBTreeSet
Eventually, once it works, this change should improve overall performance.
However, in the meantime, the trait bounds aren't playing nicely, and
this is turning into too much of a pain to handle right now as part of
/#7910. We can take care of it later.
* Simple `MaxBoundedLen` Implementations (#8793)
* implement max_values + storages info
* some formatting + doc
* sudo sanity check
* timestamp
* assets (not working)
* fix assets
* impl for proxy
* update balances
* rename StoragesInfo -> PalletStorageInfo
* merge both StorageInfoTrait and PalletStorageInfo
I think it is more future proof. In the future some storage could make
use of multiple prefix. Like one to store how much value has been
inserted, etc...
* Update frame/support/procedural/src/storage/parse.rs
Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
* Update frame/support/procedural/src/storage/storage_struct.rs
Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
* Fix max_size using hasher information
hasher now expose `max_len` which allows to computes their maximum len.
For hasher without concatenation, it is the size of the hash part,
for hasher with concatenation, it is the size of the hash part + max
encoded len of the key.
* fix tests
* fix ui tests
* Move `MaxBoundedLen` into its own crate (#8814)
* move MaxEncodedLen into its own crate
* remove MaxEncodedLen impl from frame-support
* add to assets and balances
* try more fixes
* fix compile
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
* nits
* fix compile
* line width
* fix max-values-macro merge
* Add some derive, needed for test and other purpose
* use weak bounded vec in some cases
* Update lib.rs
* move max-encoded-len crate
* fix
* remove app crypto for now
* width
* Revert "remove app crypto for now"
This reverts commit 73623e9933d50648e0e7fe90b6171a8e45d7f5a2.
* unused variable
* more unused variables
* more fixes
* Add #[max_encoded_len_crate(...)] helper attribute
The purpose of this attribute is to reduce the surface area of
max_encoded_len changes. Crates deriving `MaxEncodedLen` do not
need to add it to `Cargo.toml`; they can instead just do
```rust
\#[derive(Encode, MaxEncodedLen)]
\#[max_encoded_len_crate(frame_support::max_encoded_len)]
struct Example;
```
* fix a ui test
* use #[max_encoded_len_crate(...)] helper in app_crypto
* remove max_encoded_len import where not necessary
* update lockfile
* fix ui test
* ui
* newline
* fix merge
* try fix ui again
* Update max-encoded-len/derive/src/lib.rs
Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
* extract generate_crate_access_2018
* Update lib.rs
* compiler isnt smart enough
Co-authored-by: thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
Co-authored-by: Peter Goodspeed-Niklaus <peter.r.goodspeedniklaus@gmail.com>
* remove duplicate Issued/Burned events (#8935)
* weather -> whether (#8938)
* make remote ext use batch ws-client (#8916)
* make remote ext use batch ws-client
* Add debug log for key length
* better assertions
* new sanity_checl
* try and make it work with batch
* update test
* remove exctra uri
* add missing at
* remove unused rpc stuff
* improve
Co-authored-by: emostov <32168567+emostov@users.noreply.github.com>
* Make `Schedule` fields public to allow for customization (#8924)
* Make `Schedule` fields public for customization
* Fix doc typo
Co-authored-by: Andrew Jones <ascjones@gmail.com>
Co-authored-by: Andrew Jones <ascjones@gmail.com>
* Session key should be settable at genesis even for non-endowed accounts (#8942)
* Session key should be settable at genesis even for non-endowed accounts
* Docs
* Migrate pallet-scored-pool to pallet attribute macro (#8825)
* Migrate pallet-scored-pool to pallet attribute macro.
* Remove dummy event.
* Apply review suggestions.
* Bump retain_mut from 0.1.2 to 0.1.3 (#8951)
Bumps [retain_mut](https://github.com/upsuper/retain_mut) from 0.1.2 to 0.1.3.
- [Release notes](https://github.com/upsuper/retain_mut/releases)
- [Commits](https://github.com/upsuper/retain_mut/compare/v0.1.2...v0.1.3)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Use correct CreateInherentDataProviders impl for manual seal (#8852)
* use correct CreateInherentDataProviders impl for manual seal
* add babe inherent provider
* move client into factory fn
* Refactor code a little bit (#8932)
* Optimize `next_storage_key` (#8956)
* Optimize `next_storage_key`
- Do not rely on recursion
- Use an iterator over the overlay to not always call the same method
* Fix bug
* Add deserialize for TransactionValidityError in std. (#8961)
* Add deserialize for TransactionValidityError in std.
* Fix derives
* Bump getrandom from 0.2.2 to 0.2.3 (#8952)
Bumps [getrandom](https://github.com/rust-random/getrandom) from 0.2.2 to 0.2.3.
- [Release notes](https://github.com/rust-random/getrandom/releases)
- [Changelog](https://github.com/rust-random/getrandom/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-random/getrandom/compare/v0.2.2...v0.2.3)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Allow usage of path in construct_runtime! (#8801)
* Allow usage of path in construct_runtime!
* Fix whitespace
* Fix whitespace
* Make expand_runtime_metadata accept slice instead of Iterator
* Include Call and Event in construct_runtime for testing
* Migrate impl_outer_event to proc macro
* Fix integrity_test_works
* Update UI test expectations
* Factor in module path while generating enum variant or fn names
* Use ParseStream::lookahead for more helpful error messages
* Remove generating outer_event_metadata
* Ensure pallets with different paths but same last path segment can coexist
* Remove unnecessary generated function
* Migrate decl_outer_config to proc macro
* Add default_filter test for expand_outer_origin
* Allow crate, self and super keywords to appear in pallet path
* Add UI test for specifying empty pallet paths in construct_runtime
* Reduce cargo doc warnings (#8947)
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
* Update wasmtime to 0.27 (#8913)
* Update wasmtime to 0.27
A couple of notes:
- Now we are fair about unsafeness of runtime creation via an compiled artifact.
This change was prompted by the change in wasmtime which made
`deserialize` rightfully unsafe. Now `CodeSupplyMode` was hidden and
the `create_runtime` now takes the blob again and there is now a new
fn for creating a runtime with a compiled artifact.
- This is a big change for wasmtime. They switched to the modern backend
for code generation. While this can bring performance improvements, it
can also introduce some problems. In fact, 0.27 fixed a serious issue
that could lead to sandbox escape. Hence we need a proper burn in.
This would require a change to PVF validation host as well.
* Filter regalloc logging
* Spellling corrections (no code changes) (#8971)
* Spelling corrections
* As this might break let's do as a separate PR
* Dependabot use correct label (#8973)
* Inject hashed prefix for remote-ext (#8960)
* Inject for remote-ext
* Update utils/frame/remote-externalities/src/lib.rs
Co-authored-by: Zeke Mostov <32168567+emostov@users.noreply.github.com>
* Update utils/frame/remote-externalities/src/lib.rs
Co-authored-by: Zeke Mostov <32168567+emostov@users.noreply.github.com>
* Apply suggestions from code review
* Apply suggestions from code review
Co-authored-by: Zeke Mostov <32168567+emostov@users.noreply.github.com>
* Use `SpawnTaskHandle`s for spawning tasks in the tx pool (#8958)
* Remove futures-diagnose
* Use `SpawnTaskHandle`s for spawning tasks in the tx pool
* Box the spawner
* Fix tests
* Use the testing task executor
* Do not spend time on verifying the signatures before calling Runtime (#8980)
* Revert "Use `SpawnTaskHandle`s for spawning tasks in the tx pool (#8958)" (#8983)
This reverts commit 84e402389b.
* Uniques: An economically-secure basic-featured NFT pallet (#8813)
* Uniques: An economically-secure basic-featured NFT pallet
* force_transfer
* freeze/thaw
* team management
* approvals
* Fixes
* force_asset_status
* class_metadata
* instance metadata
* Fixes
* use nmap
* Fixes
* class metadata has information field
* Intiial mock/tests and a fix
* Remove impl_non_fungibles
* Docs
* Update frame/uniques/src/lib.rs
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
* Update frame/uniques/src/lib.rs
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
* Update frame/uniques/src/lib.rs
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
* Update frame/uniques/src/lib.rs
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
* Reserve, don't transfer.
* Fixes
* Tests
* Tests
* refresh_deposit
* Tests and proper handling of metdata destruction
* test burn
* Tests
* Update impl_fungibles.rs
* Initial benchmarking
* benchmark
* Fixes
* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_uniques --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/uniques/src/weights.rs --template=./.maintain/frame-weight-template.hbs
* Attributes
* Attribute metadata
* Fixes
* Update frame/uniques/README.md
* Docs
* Docs
* Docs
* Simple metadata
* Use BoundedVec
* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_uniques --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/uniques/src/weights.rs --template=./.maintain/frame-weight-template.hbs
* Update frame/uniques/src/lib.rs
Co-authored-by: Lohann Paterno Coutinho Ferreira <developer@lohann.dev>
* Update frame/uniques/src/lib.rs
Co-authored-by: Lohann Paterno Coutinho Ferreira <developer@lohann.dev>
* Update frame/uniques/src/lib.rs
Co-authored-by: Lohann Paterno Coutinho Ferreira <developer@lohann.dev>
* Update frame/uniques/src/lib.rs
Co-authored-by: Lohann Paterno Coutinho Ferreira <developer@lohann.dev>
* Update frame/uniques/src/lib.rs
Co-authored-by: Lohann Paterno Coutinho Ferreira <developer@lohann.dev>
* Fixes
* Update frame/uniques/README.md
Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>
* Update frame/uniques/README.md
Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>
* Update frame/uniques/README.md
Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>
* Docs
* Bump
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: Parity Bot <admin@parity.io>
Co-authored-by: Lohann Paterno Coutinho Ferreira <developer@lohann.dev>
Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>
* Update WeakBoundedVec's remove and swap_remove (#8985)
Co-authored-by: Boiethios <felix-dev@daudre-vignier.fr>
* Convert another instance of Into impl to From in the macros (#8986)
* Convert another instance of Into impl to From in the macros
* Convert another location
* also fix bounded vec (#8987)
* fix most compiler errors
Mostly the work so far has been in tracking down where precisely
to insert appropriate trait bounds, and updating `fn insert_submission`.
However, there's still a compiler error remaining:
```
error[E0275]: overflow evaluating the requirement `Compact<_>: Decode`
|
= help: consider adding a `#![recursion_limit="256"]` attribute to your crate (`pallet_election_provider_multi_phase`)
= note: required because of the requirements on the impl of `Decode` for `Compact<_>`
= note: 126 redundant requirements hidden
= note: required because of the requirements on the impl of `Decode` for `Compact<_>`
```
Next up: figure out how we ended up with that recursive bound, and fix it.
* extract type SignedSubmissionsOf<T>
Weirdly, we still encounter the recursive trait definition error here,
despite removing the trait bounds. Something weird is happening.
* impl Decode bounds on BoundedBTreeMap/Set on T, not predecessor
Otherwise, Rust gets confused and decides that the trait bound is
infinitely recursive.
For that matter, it _still_ gets confused somehow and decides
that the trait bound is infinitely recursive, but at least
this should somewhat simplify the matter.
* fix recursive trait bound problem
* minor fixes
* more little fixes
* correct semantics for try_insert
* more fixes
* derive Ord for SolutionType
* tests compile
* fix most tests, rm unnecessary one
* Transactionpool: Make `ready_at` return earlier (#8995)
`ready_at` returns when we have processed the requested block. However,
on startup we already have processed the best block and there
are no transactions in the pool on startup anyway. So, we can set `updated_at`
to the best block on startup.
Besides that `ready_at` now returns early when there are no ready nor
any future transactions in the pool.
* Discard notifications if we have failed to parse handshake (#8806)
* Migrate pallet-democracy to pallet attribute macro (#8824)
* Migrate pallet-democracy to pallet attribute macro.
* Metadata fix.
* Trigger CI.
* Add ecdsa::Pair::verify_prehashed() (#8996)
* Add ecdsa::Pair::verify_prehashed()
* turn verify_prehashed() into an associated function
* add Signature::recover_prehashed()
* Non-fungible token traits (#8993)
* Non-fungible token traits
* Docs
* Fixes
* Implement non-fungible trait for Uniques
* Update frame/uniques/src/impl_nonfungibles.rs
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
* Update frame/uniques/src/impl_nonfungibles.rs
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
* Removes unused import (#9007)
* Add Call Filter That Prevents Nested `batch_all` (#9009)
* add filter preventing nested `batch_all`
* more tests
* fix test
* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_utility --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/utility/src/weights.rs --template=./.maintain/frame-weight-template.hbs
Co-authored-by: Parity Bot <admin@parity.io>
* Transaction pool: Ensure that we prune transactions properly (#8963)
* Transaction pool: Ensure that we prune transactions properly
There was a bug in the transaction pool that we didn't pruned
transactions properly because we called `prune_known`, instead of `prune`.
This bug was introduced by:
https://github.com/paritytech/substrate/pull/4629
This is required to have stale extrinsics being removed properly, so
that they don't fill up the tx pool.
* Fix compilation
* Fix benches
* ...
* Storage chain: Runtime module (#8624)
* Transaction storage runtime module
* WIP: Tests
* Tests, benchmarks and docs
* Made check_proof mandatory
* Typo
* Renamed a crate
* Apply suggestions from code review
Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
* Added weight for on_finalize
* Fixed counter mutations
* Reorganized tests
* Fixed build
* Update for the new inherent API
* Reworked for the new inherents API
* Apply suggestions from code review
Co-authored-by: cheme <emericchevalier.pro@gmail.com>
Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
* Store transactions in a Vec
* Added FeeDestination
* Get rid of constants
* Fixed node runtime build
* Fixed benches
* Update frame/transaction-storage/src/lib.rs
Co-authored-by: cheme <emericchevalier.pro@gmail.com>
Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Co-authored-by: cheme <emericchevalier.pro@gmail.com>
Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
* more useful error message (#9014)
* Named reserve (#7778)
* add NamedReservableCurrency
* move currency related trait and types into a new file
* implement NamedReservableCurrency
* remove empty reserves
* Update frame/support/src/traits.rs
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
* fix build
* bump year
* add MaxReserves
* repatriate_reserved_named should put reserved fund into named reserved
* add tests
* add some docs
* fix warning
* Update lib.rs
* fix test
* fix test
* fix
* fix
* triggier CI
* Move NamedReservableCurrency.
* Use strongly bounded vec for reserves.
* Fix test.
* remove duplicated file
* trigger CI
* Make `ReserveIdentifier` assosicated type
* add helpers
* make ReserveIdentifier assosicated type
* fix
* update
* trigger CI
* Apply suggestions from code review
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
* trigger CI
* Apply suggestions from code review
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: Gavin Wood <i@gavwood.com>
Co-authored-by: Shaun Wang <spxwang@gmail.com>
* update ss58 type to u16 (#8955)
* Fixed build (#9021)
* Bump parity-db (#9024)
* consensus: handle justification sync for blocks authored locally (#8698)
* consensus: add trait to control justification sync process
* network: implement JustificationSyncLink for NetworkService
* slots: handle justification sync in slot worker
* babe: fix slot worker instantiation
* aura: fix slot worker instantiation
* pow: handle justification sync in miner
* babe: fix tests
* aura: fix tests
* node: fix compilation
* node-template: fix compilation
* consensus: rename justification sync link parameter
* aura: fix test compilation
* consensus: slots: move JustificationSyncLink out of on_slot
* arithmetic: fix PerThing pow (#9030)
* arithmetic: add failing test for pow
* arithmetic: fix PerThing::pow
* Revert back to previous optimisations
Co-authored-by: Gav Wood <gavin@parity.io>
* Compact proof utilities in sp_trie. (#8574)
* validation extension in sp_io
* need paths
* arc impl
* missing host function in executor
* io to pkdot
* decode function.
* encode primitive.
* trailing tab
* multiple patch
* fix child trie logic
* restore master versionning
* bench compact proof size
* trie-db 22.3 is needed
* line width
* split line
* fixes for bench (additional root may not be needed as original issue was
with empty proof).
* revert compact from block size calculation.
* New error type for compression.
* Adding test (incomplete (failing)).
Also lacking real proof checking (no good primitives in sp-trie crate).
* There is currently no proof recording utility in sp_trie, removing
test.
* small test of child root in proof without a child proof.
* remove empty test.
* remove non compact proof size
* Missing revert.
* proof method to encode decode.
* Don't inlucde nominaotrs that back no one in the snapshot. (#9017)
* fix all_in_one test which had a logic error
* use sp_std, not std
* Periodically call `Peerset::alloc_slots` on all sets (#9025)
* Periodically call alloc_slots on all slots
* Add test
* contracts: Add new `seal_call` that offers new features (#8909)
* Add new `seal_call` that offers new features
* Fix doc typo
Co-authored-by: Michael Müller <michi@parity.io>
* Fix doc typos
Co-authored-by: Michael Müller <michi@parity.io>
* Fix comment on assert
* Update CHANGELOG.md
Co-authored-by: Michael Müller <michi@parity.io>
* fix unreserve_all_named (#9042)
* Delete legacy runtime metadata macros (#9043)
* `rpc-http-threads` cli arg (#8890)
* Add optional `rpc-http-threads` cli arg
* Update `http::ServerBuilder`threads
* allow inserting equal items into bounded map/set
* refactor: only load one solution at a time
This increases the database read load, because we read one solution
at a time. On the other hand, it substantially decreases the overall
memory load, because we _only_ read one solution at a time instead
of reading all of them.
* Emit `Bonded` event when rebonding (#9040)
* Emit `Bonded` event when rebonding
* fix borrow checker
* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_staking --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/staking/src/weights.rs --template=./.maintain/frame-weight-template.hbs
Co-authored-by: Parity Bot <admin@parity.io>
* fix tests
* Revert "Merge remote-tracking branch 'origin/master' into prgn-election-provider-multi-phase-bounded-btree-set-signed-submissions"
This reverts commit de92b1e8e0e44a74c24e270d02b6e8e6a2c37032, reversing
changes made to dae31f2018593b60dbf1d96ec96cdc35c374bb9e.
* only derive debug when std
* write after check
* SignedSubmissions doesn't ever modify storage until .put()
This makes a true check-before-write pattern possible.
* REVERT ME: demo that Drop impl doesn't work
* Revert "REVERT ME: demo that Drop impl doesn't work"
This reverts commit 3317a4bb4de2e77d5a7fff2154552a81ec081763.
* doc note about decode_len
* rename get_submission, take_submission for clarity
* add test which fails for current incorrect behavior
* inline fn insert_submission
This fixes a tricky check-before-write error, ensuring that we
really only ever modify anything if we have in fact succeeded.
Co-authored-by: Roman Proskuryakov <humbug@deeptown.org>
Co-authored-by: Denis Pisarev <denis.pisarev@parity.io>
Co-authored-by: MOZGIII <mike-n@narod.ru>
Co-authored-by: Alexander Theißen <alex.theissen@me.com>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com>
Co-authored-by: Sebastian Müller <sebastian@web3.foundation>
Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Co-authored-by: emostov <32168567+emostov@users.noreply.github.com>
Co-authored-by: Andrew Jones <ascjones@gmail.com>
Co-authored-by: Gavin Wood <gavin@parity.io>
Co-authored-by: Shaun Wang <spxwang@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Seun Lanlege <seun@parity.io>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: Keith Yeung <kungfukeith11@gmail.com>
Co-authored-by: Squirrel <gilescope@gmail.com>
Co-authored-by: Sergei Shulepov <sergei@parity.io>
Co-authored-by: Ashley <ashley.ruglys@gmail.com>
Co-authored-by: Parity Bot <admin@parity.io>
Co-authored-by: Lohann Paterno Coutinho Ferreira <developer@lohann.dev>
Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>
Co-authored-by: Boiethios <Boiethios@users.noreply.github.com>
Co-authored-by: Boiethios <felix-dev@daudre-vignier.fr>
Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>
Co-authored-by: Andreas Doerr <adoerr@users.noreply.github.com>
Co-authored-by: Dmitry Kashitsyn <korvin@deeptown.org>
Co-authored-by: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Co-authored-by: cheme <emericchevalier.pro@gmail.com>
Co-authored-by: Andronik Ordian <write@reusable.software>
Co-authored-by: Xiliang Chen <xlchen1291@gmail.com>
Co-authored-by: Gavin Wood <i@gavwood.com>
Co-authored-by: Jakub Pánik <jakub.panik@gmail.com>
Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
Co-authored-by: Michael Müller <michi@parity.io>
Co-authored-by: tgmichel <telmo@purestake.com>
* cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_election_provider_multi_phase --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/election-provider-multi-phase/src/weights.rs --template=./.maintain/frame-weight-template.hbs
* remove duplicate weight definitions injected by benchmark bot
* check deletion overlay before getting
* clarify non-conflict between delete, insert overlays
* drain can be used wrong so is private
* update take_submission docs
* more drain improvements
* more take_submission docs
* debug assertion helps prove expectation is valid
* doc on changing SignedMaxSubmissions
* take_submission inner doc on system properties
* Apply suggestions from code review
Co-authored-by: Zeke Mostov <32168567+emostov@users.noreply.github.com>
Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
* get SolutionOrSnapshotSize out of the loop
Co-authored-by: Zeke Mostov <32168567+emostov@users.noreply.github.com>
* doc which items comprise `SignedSubmissions`
* add doc about index as unique identifier
* Add debug assertions to prove drain worked properly
Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
* replace take_submission with swap_out_submission
* use a match to demonstrate all cases from signed_submissions.insert
* refactor signed_submissions.insert return type
* prettify test assertion
Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
* improve docs
Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
* add tests that finalize_signed_phase is idempotent
* add some debug assertions to guard against misuse of storage
* log internal logic errors instead of panicing
* don't store the reward with each signed submission
The signed reward base can be treated as a constant. It can in principle
change, but even if it's updated in the middle of an election, it's
appropriate to use the current value for the winner.
* emit Rewarded, Slashed events as appropriate
Makes it easier to see who won/lost with signed submissions.
* update docs
* use a custom enum to be explicit about the outcome of insertion
* remove outdated docs
Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
Co-authored-by: Peter Goodspeed-Niklaus <peter.r.goodspeedniklaus@gmail.com>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: Roman Proskuryakov <humbug@deeptown.org>
Co-authored-by: Denis Pisarev <denis.pisarev@parity.io>
Co-authored-by: MOZGIII <mike-n@narod.ru>
Co-authored-by: Alexander Theißen <alex.theissen@me.com>
Co-authored-by: thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com>
Co-authored-by: Sebastian Müller <sebastian@web3.foundation>
Co-authored-by: emostov <32168567+emostov@users.noreply.github.com>
Co-authored-by: Andrew Jones <ascjones@gmail.com>
Co-authored-by: Gavin Wood <gavin@parity.io>
Co-authored-by: Shaun Wang <spxwang@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Seun Lanlege <seun@parity.io>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: Keith Yeung <kungfukeith11@gmail.com>
Co-authored-by: Squirrel <gilescope@gmail.com>
Co-authored-by: Sergei Shulepov <sergei@parity.io>
Co-authored-by: Ashley <ashley.ruglys@gmail.com>
Co-authored-by: Lohann Paterno Coutinho Ferreira <developer@lohann.dev>
Co-authored-by: Alexander Popiak <alexander.popiak@parity.io>
Co-authored-by: Boiethios <Boiethios@users.noreply.github.com>
Co-authored-by: Boiethios <felix-dev@daudre-vignier.fr>
Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>
Co-authored-by: Andreas Doerr <adoerr@users.noreply.github.com>
Co-authored-by: Dmitry Kashitsyn <korvin@deeptown.org>
Co-authored-by: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Co-authored-by: cheme <emericchevalier.pro@gmail.com>
Co-authored-by: Andronik Ordian <write@reusable.software>
Co-authored-by: Xiliang Chen <xlchen1291@gmail.com>
Co-authored-by: Gavin Wood <i@gavwood.com>
Co-authored-by: Jakub Pánik <jakub.panik@gmail.com>
Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
Co-authored-by: Michael Müller <michi@parity.io>
Co-authored-by: tgmichel <telmo@purestake.com>
This commit is contained in:
Kian Paimani
@@ -231,7 +231,7 @@ use codec::{Decode, Encode};
|
||||
use frame_support::{
|
||||
dispatch::DispatchResultWithPostInfo,
|
||||
ensure,
|
||||
traits::{Currency, Get, ReservableCurrency},
|
||||
traits::{Currency, Get, ReservableCurrency, OnUnbalanced},
|
||||
weights::Weight,
|
||||
};
|
||||
use frame_system::{ensure_none, offchain::SendTransactionTypes};
|
||||
@@ -266,10 +266,14 @@ pub mod helpers;
|
||||
|
||||
const LOG_TARGET: &'static str = "runtime::election-provider";
|
||||
|
||||
pub mod signed;
|
||||
pub mod unsigned;
|
||||
pub mod weights;
|
||||
|
||||
/// The weight declaration of the pallet.
|
||||
pub use signed::{
|
||||
BalanceOf, NegativeImbalanceOf, PositiveImbalanceOf, SignedSubmission, SignedSubmissionOf,
|
||||
SignedSubmissions, SubmissionIndicesOf,
|
||||
};
|
||||
pub use weights::WeightInfo;
|
||||
|
||||
/// The compact solution type used by this crate.
|
||||
@@ -411,7 +415,7 @@ impl Default for ElectionCompute {
|
||||
///
|
||||
/// Such a solution should never become effective in anyway before being checked by the
|
||||
/// `Pallet::feasibility_check`
|
||||
#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug)]
|
||||
#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug, PartialOrd, Ord)]
|
||||
pub struct RawSolution<C> {
|
||||
/// Compact election edges.
|
||||
pub compact: C,
|
||||
@@ -583,6 +587,44 @@ pub mod pallet {
|
||||
/// this value, based on [`WeightInfo::submit_unsigned`].
|
||||
type MinerMaxWeight: Get<Weight>;
|
||||
|
||||
/// Maximum number of signed submissions that can be queued.
|
||||
///
|
||||
/// It is best to avoid adjusting this during an election, as it impacts downstream data
|
||||
/// structures. In particular, `SignedSubmissionIndices<T>` is bounded on this value. If you
|
||||
/// update this value during an election, you _must_ ensure that
|
||||
/// `SignedSubmissionIndices.len()` is less than or equal to the new value. Otherwise,
|
||||
/// attempts to submit new solutions may cause a runtime panic.
|
||||
#[pallet::constant]
|
||||
type SignedMaxSubmissions: Get<u32>;
|
||||
|
||||
/// Maximum weight of a signed solution.
|
||||
///
|
||||
/// This should probably be similar to [`Config::MinerMaxWeight`].
|
||||
#[pallet::constant]
|
||||
type SignedMaxWeight: Get<Weight>;
|
||||
|
||||
/// Base reward for a signed solution
|
||||
#[pallet::constant]
|
||||
type SignedRewardBase: Get<BalanceOf<Self>>;
|
||||
|
||||
/// Base deposit for a signed solution.
|
||||
#[pallet::constant]
|
||||
type SignedDepositBase: Get<BalanceOf<Self>>;
|
||||
|
||||
/// Per-byte deposit for a signed solution.
|
||||
#[pallet::constant]
|
||||
type SignedDepositByte: Get<BalanceOf<Self>>;
|
||||
|
||||
/// Per-weight deposit for a signed solution.
|
||||
#[pallet::constant]
|
||||
type SignedDepositWeight: Get<BalanceOf<Self>>;
|
||||
|
||||
/// Handler for the slashed deposits.
|
||||
type SlashHandler: OnUnbalanced<NegativeImbalanceOf<Self>>;
|
||||
|
||||
/// Handler for the rewards.
|
||||
type RewardHandler: OnUnbalanced<PositiveImbalanceOf<Self>>;
|
||||
|
||||
/// Maximum length (bytes) that the mined solution should consume.
|
||||
///
|
||||
/// The miner will ensure that the total length of the unsigned solution will not exceed
|
||||
@@ -599,6 +641,7 @@ pub mod pallet {
|
||||
+ Eq
|
||||
+ Clone
|
||||
+ sp_std::fmt::Debug
|
||||
+ Ord
|
||||
+ CompactSolution;
|
||||
|
||||
/// Accuracy used for fallback on-chain election.
|
||||
@@ -656,11 +699,20 @@ pub mod pallet {
|
||||
Phase::Signed | Phase::Off
|
||||
if remaining <= unsigned_deadline && remaining > Zero::zero() =>
|
||||
{
|
||||
// Determine if followed by signed or not.
|
||||
// our needs vary according to whether or not the unsigned phase follows a signed phase
|
||||
let (need_snapshot, enabled, signed_weight) = if current_phase == Phase::Signed {
|
||||
// Followed by a signed phase: close the signed phase, no need for snapshot.
|
||||
// TODO: proper weight https://github.com/paritytech/substrate/pull/7910.
|
||||
(false, true, Weight::zero())
|
||||
// there was previously a signed phase: close the signed phase, no need for snapshot.
|
||||
//
|
||||
// Notes:
|
||||
//
|
||||
// - `Self::finalize_signed_phase()` also appears in `fn do_elect`. This is
|
||||
// a guard against the case that `elect` is called prematurely. This adds
|
||||
// a small amount of overhead, but that is unfortunately unavoidable.
|
||||
let (_success, weight) = Self::finalize_signed_phase();
|
||||
// In the future we can consider disabling the unsigned phase if the signed
|
||||
// phase completes successfully, but for now we're enabling it unconditionally
|
||||
// as a defensive measure.
|
||||
(false, true, weight)
|
||||
} else {
|
||||
// No signed phase: create a new snapshot, definitely `enable` the unsigned
|
||||
// phase.
|
||||
@@ -807,8 +859,12 @@ pub mod pallet {
|
||||
|
||||
// Store the newly received solution.
|
||||
log!(info, "queued unsigned solution with score {:?}", ready.score);
|
||||
let ejected_a_solution = <QueuedSolution<T>>::exists();
|
||||
<QueuedSolution<T>>::put(ready);
|
||||
Self::deposit_event(Event::SolutionStored(ElectionCompute::Unsigned));
|
||||
Self::deposit_event(Event::SolutionStored(
|
||||
ElectionCompute::Unsigned,
|
||||
ejected_a_solution,
|
||||
));
|
||||
|
||||
Ok(None.into())
|
||||
}
|
||||
@@ -828,6 +884,79 @@ pub mod pallet {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Submit a solution for the signed phase.
|
||||
///
|
||||
/// The dispatch origin fo this call must be __signed__.
|
||||
///
|
||||
/// The solution is potentially queued, based on the claimed score and processed at the end
|
||||
/// of the signed phase.
|
||||
///
|
||||
/// A deposit is reserved and recorded for the solution. Based on the outcome, the solution
|
||||
/// might be rewarded, slashed, or get all or a part of the deposit back.
|
||||
///
|
||||
/// # <weight>
|
||||
/// Queue size must be provided as witness data.
|
||||
/// # </weight>
|
||||
#[pallet::weight(T::WeightInfo::submit(*num_signed_submissions))]
|
||||
pub fn submit(
|
||||
origin: OriginFor<T>,
|
||||
solution: RawSolution<CompactOf<T>>,
|
||||
num_signed_submissions: u32,
|
||||
) -> DispatchResult {
|
||||
let who = ensure_signed(origin)?;
|
||||
|
||||
// ensure witness data is correct.
|
||||
ensure!(
|
||||
num_signed_submissions >= <SignedSubmissions<T>>::decode_len().unwrap_or_default() as u32,
|
||||
Error::<T>::SignedInvalidWitness,
|
||||
);
|
||||
|
||||
// ensure solution is timely.
|
||||
ensure!(Self::current_phase().is_signed(), Error::<T>::PreDispatchEarlySubmission);
|
||||
|
||||
// NOTE: this is the only case where having separate snapshot would have been better
|
||||
// because could do just decode_len. But we can create abstractions to do this.
|
||||
|
||||
// build size. Note: this is not needed for weight calc, thus not input.
|
||||
// unlikely to ever return an error: if phase is signed, snapshot will exist.
|
||||
let size = Self::snapshot_metadata().ok_or(Error::<T>::MissingSnapshotMetadata)?;
|
||||
|
||||
ensure!(
|
||||
Self::feasibility_weight_of(&solution, size) < T::SignedMaxWeight::get(),
|
||||
Error::<T>::SignedTooMuchWeight,
|
||||
);
|
||||
|
||||
// create the submission
|
||||
let deposit = Self::deposit_for(&solution, size);
|
||||
let submission = SignedSubmission { who: who.clone(), deposit, solution };
|
||||
|
||||
// insert the submission if the queue has space or it's better than the weakest
|
||||
// eject the weakest if the queue was full
|
||||
let mut signed_submissions = Self::signed_submissions();
|
||||
let maybe_removed = match signed_submissions.insert(submission) {
|
||||
// it's an error if we failed to insert a submission: this indicates the queue was
|
||||
// full but our solution had insufficient score to eject any solution
|
||||
signed::InsertResult::NotInserted => return Err(Error::<T>::SignedQueueFull.into()),
|
||||
signed::InsertResult::Inserted => None,
|
||||
signed::InsertResult::InsertedEjecting(weakest) => Some(weakest),
|
||||
};
|
||||
|
||||
// collect deposit. Thereafter, the function cannot fail.
|
||||
T::Currency::reserve(&who, deposit)
|
||||
.map_err(|_| Error::<T>::SignedCannotPayDeposit)?;
|
||||
|
||||
let ejected_a_solution = maybe_removed.is_some();
|
||||
// if we had to remove the weakest solution, unreserve its deposit
|
||||
if let Some(removed) = maybe_removed {
|
||||
let _remainder = T::Currency::unreserve(&removed.who, removed.deposit);
|
||||
debug_assert!(_remainder.is_zero());
|
||||
}
|
||||
|
||||
signed_submissions.put();
|
||||
Self::deposit_event(Event::SolutionStored(ElectionCompute::Signed, ejected_a_solution));
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Set a solution in the queue, to be handed out to the client of this pallet in the next
|
||||
/// call to `ElectionProvider::elect`.
|
||||
///
|
||||
@@ -860,7 +989,9 @@ pub mod pallet {
|
||||
///
|
||||
/// If the solution is signed, this means that it hasn't yet been processed. If the
|
||||
/// solution is unsigned, this means that it has also been processed.
|
||||
SolutionStored(ElectionCompute),
|
||||
///
|
||||
/// The `bool` is `true` when a previous solution was ejected to make room for this one.
|
||||
SolutionStored(ElectionCompute, bool),
|
||||
/// The election has been finalized, with `Some` of the given computation, or else if the
|
||||
/// election failed, `None`.
|
||||
ElectionFinalized(Option<ElectionCompute>),
|
||||
@@ -883,8 +1014,20 @@ pub mod pallet {
|
||||
PreDispatchWrongWinnerCount,
|
||||
/// Submission was too weak, score-wise.
|
||||
PreDispatchWeakSubmission,
|
||||
/// The queue was full, and the solution was not better than any of the existing ones.
|
||||
SignedQueueFull,
|
||||
/// The origin failed to pay the deposit.
|
||||
SignedCannotPayDeposit,
|
||||
/// Witness data to dispatchable is invalid.
|
||||
SignedInvalidWitness,
|
||||
/// The signed submission consumes too much weight
|
||||
SignedTooMuchWeight,
|
||||
/// OCW submitted solution for wrong round
|
||||
OcwCallWrongEra,
|
||||
/// Snapshot metadata should exist but didn't.
|
||||
MissingSnapshotMetadata,
|
||||
/// `Self::insert_submission` returned an invalid index.
|
||||
InvalidSubmissionIndex,
|
||||
/// The call is not allowed at this point.
|
||||
CallNotAllowed,
|
||||
}
|
||||
@@ -988,6 +1131,45 @@ pub mod pallet {
|
||||
#[pallet::getter(fn snapshot_metadata)]
|
||||
pub type SnapshotMetadata<T: Config> = StorageValue<_, SolutionOrSnapshotSize>;
|
||||
|
||||
// The following storage items collectively comprise `SignedSubmissions<T>`, and should never be
|
||||
// accessed independently. Instead, get `Self::signed_submissions()`, modify it as desired, and
|
||||
// then do `signed_submissions.put()` when you're done with it.
|
||||
|
||||
/// The next index to be assigned to an incoming signed submission.
|
||||
///
|
||||
/// Every accepted submission is assigned a unique index; that index is bound to that particular
|
||||
/// submission for the duration of the election. On election finalization, the next index is
|
||||
/// reset to 0.
|
||||
///
|
||||
/// We can't just use `SignedSubmissionIndices.len()`, because that's a bounded set; past its
|
||||
/// capacity, it will simply saturate. We can't just iterate over `SignedSubmissionsMap`,
|
||||
/// because iteration is slow. Instead, we store the value here.
|
||||
#[pallet::storage]
|
||||
pub(crate) type SignedSubmissionNextIndex<T: Config> = StorageValue<_, u32, ValueQuery>;
|
||||
|
||||
/// A sorted, bounded set of `(score, index)`, where each `index` points to a value in
|
||||
/// `SignedSubmissions`.
|
||||
///
|
||||
/// We never need to process more than a single signed submission at a time. Signed submissions
|
||||
/// can be quite large, so we're willing to pay the cost of multiple database accesses to access
|
||||
/// them one at a time instead of reading and decoding all of them at once.
|
||||
#[pallet::storage]
|
||||
pub(crate) type SignedSubmissionIndices<T: Config> =
|
||||
StorageValue<_, SubmissionIndicesOf<T>, ValueQuery>;
|
||||
|
||||
/// Unchecked, signed solutions.
|
||||
///
|
||||
/// Together with `SubmissionIndices`, this stores a bounded set of `SignedSubmissions` while
|
||||
/// allowing us to keep only a single one in memory at a time.
|
||||
///
|
||||
/// Twox note: the key of the map is an auto-incrementing index which users cannot inspect or
|
||||
/// affect; we shouldn't need a cryptographically secure hasher.
|
||||
#[pallet::storage]
|
||||
pub(crate) type SignedSubmissionsMap<T: Config> =
|
||||
StorageMap<_, Twox64Concat, u32, SignedSubmissionOf<T>, ValueQuery>;
|
||||
|
||||
// `SignedSubmissions` items end here.
|
||||
|
||||
/// The minimum score that each 'untrusted' solution must attain in order to be considered
|
||||
/// feasible.
|
||||
///
|
||||
@@ -1223,7 +1405,7 @@ impl<T: Config> Pallet<T> {
|
||||
/// 3. Clear all snapshot data.
|
||||
fn rotate_round() {
|
||||
// Inc round.
|
||||
<Round<T>>::mutate(|r| *r = *r + 1);
|
||||
<Round<T>>::mutate(|r| *r += 1);
|
||||
|
||||
// Phase is off now.
|
||||
<CurrentPhase<T>>::put(Phase::Off);
|
||||
@@ -1242,6 +1424,13 @@ impl<T: Config> Pallet<T> {
|
||||
}
|
||||
|
||||
fn do_elect() -> Result<(Supports<T::AccountId>, Weight), ElectionError> {
|
||||
// We have to unconditionally try finalizing the signed phase here. There are only two
|
||||
// possibilities:
|
||||
//
|
||||
// - signed phase was open, in which case this is essential for correct functioning of the system
|
||||
// - signed phase was complete or not started, in which case finalization is idempotent and
|
||||
// inexpensive (1 read of an empty vector).
|
||||
let (_, signed_finalize_weight) = Self::finalize_signed_phase();
|
||||
<QueuedSolution<T>>::take()
|
||||
.map_or_else(
|
||||
|| match T::Fallback::get() {
|
||||
@@ -1261,7 +1450,7 @@ impl<T: Config> Pallet<T> {
|
||||
if Self::round() != 1 {
|
||||
log!(info, "Finalized election round with compute {:?}.", compute);
|
||||
}
|
||||
(supports, weight)
|
||||
(supports, weight.saturating_add(signed_finalize_weight))
|
||||
})
|
||||
.map_err(|err| {
|
||||
Self::deposit_event(Event::ElectionFinalized(None));
|
||||
@@ -1309,7 +1498,14 @@ mod feasibility_check {
|
||||
//! more. The best way to audit and review these tests is to try and come up with a solution
|
||||
//! that is invalid, but gets through the system as valid.
|
||||
|
||||
use super::{mock::*, *};
|
||||
use super::*;
|
||||
use crate::{
|
||||
mock::{
|
||||
MultiPhase, Runtime, roll_to, TargetIndex, raw_solution, EpochLength, UnsignedPhase,
|
||||
SignedPhase, VoterIndex, ExtBuilder,
|
||||
},
|
||||
};
|
||||
use frame_support::assert_noop;
|
||||
|
||||
const COMPUTE: ElectionCompute = ElectionCompute::OnChain;
|
||||
|
||||
@@ -1476,16 +1672,24 @@ mod feasibility_check {
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::{mock::*, Event, *};
|
||||
use super::*;
|
||||
use crate::{
|
||||
Phase,
|
||||
mock::{
|
||||
ExtBuilder, MultiPhase, Runtime, roll_to, MockWeightInfo, AccountId, TargetIndex,
|
||||
Targets, multi_phase_events, System, SignedMaxSubmissions,
|
||||
},
|
||||
};
|
||||
use frame_election_provider_support::ElectionProvider;
|
||||
use frame_support::{assert_noop, assert_ok};
|
||||
use sp_npos_elections::Support;
|
||||
|
||||
#[test]
|
||||
fn phase_rotation_works() {
|
||||
ExtBuilder::default().build_and_execute(|| {
|
||||
// 0 ------- 15 ------- 25 ------- 30 ------- ------- 45 ------- 55 ------- 60
|
||||
// | | | |
|
||||
// Signed Unsigned Signed Unsigned
|
||||
// | | | | | |
|
||||
// Signed Unsigned Elect Signed Unsigned Elect
|
||||
|
||||
assert_eq!(System::block_number(), 0);
|
||||
assert_eq!(MultiPhase::current_phase(), Phase::Off);
|
||||
@@ -1644,6 +1848,44 @@ mod tests {
|
||||
assert!(MultiPhase::snapshot_metadata().is_none());
|
||||
assert!(MultiPhase::desired_targets().is_none());
|
||||
assert!(MultiPhase::queued_solution().is_none());
|
||||
assert!(MultiPhase::signed_submissions().is_empty());
|
||||
})
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn early_termination_with_submissions() {
|
||||
// an early termination in the signed phase, with no queued solution.
|
||||
ExtBuilder::default().build_and_execute(|| {
|
||||
// signed phase started at block 15 and will end at 25.
|
||||
roll_to(14);
|
||||
assert_eq!(MultiPhase::current_phase(), Phase::Off);
|
||||
|
||||
roll_to(15);
|
||||
assert_eq!(multi_phase_events(), vec![Event::SignedPhaseStarted(1)]);
|
||||
assert_eq!(MultiPhase::current_phase(), Phase::Signed);
|
||||
assert_eq!(MultiPhase::round(), 1);
|
||||
|
||||
// fill the queue with signed submissions
|
||||
for s in 0..SignedMaxSubmissions::get() {
|
||||
let solution = RawSolution { score: [(5 + s).into(), 0, 0], ..Default::default() };
|
||||
assert_ok!(MultiPhase::submit(
|
||||
crate::mock::Origin::signed(99),
|
||||
solution,
|
||||
MultiPhase::signed_submissions().len() as u32
|
||||
));
|
||||
}
|
||||
|
||||
// an unexpected call to elect.
|
||||
roll_to(20);
|
||||
assert!(MultiPhase::elect().is_ok());
|
||||
|
||||
// all storage items must be cleared.
|
||||
assert_eq!(MultiPhase::round(), 2);
|
||||
assert!(MultiPhase::snapshot().is_none());
|
||||
assert!(MultiPhase::snapshot_metadata().is_none());
|
||||
assert!(MultiPhase::desired_targets().is_none());
|
||||
assert!(MultiPhase::queued_solution().is_none());
|
||||
assert!(MultiPhase::signed_submissions().is_empty());
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user