Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
51af46b
feat: add `feasibility_check` on mined solution
niklasad1 Mar 7, 2023
639081e
update substrate
niklasad1 Mar 21, 2023
8c5bd8d
update metadata
niklasad1 Mar 21, 2023
2a88e08
fix miner tests
niklasad1 Mar 21, 2023
438ef0e
Merge remote-tracking branch 'origin/main' into na-add-feasibility-check
niklasad1 Mar 21, 2023
1391dca
update staking miner playground
niklasad1 Mar 21, 2023
3a8483b
remove noise
niklasad1 Mar 22, 2023
6e5588e
rewrite me
niklasad1 Mar 28, 2023
274de27
Merge remote-tracking branch 'origin/main' into na-staking-miner-trim…
niklasad1 Apr 26, 2023
0ae0909
make it more readable
niklasad1 Apr 26, 2023
ce2c5a4
fix trimming test: assert trimmed > 0
niklasad1 May 1, 2023
48e4820
test: trimming assert solution mined
niklasad1 May 2, 2023
fde53cb
hack hack
niklasad1 May 2, 2023
33f75de
Merge remote-tracking branch 'origin/main' into na-staking-miner-trim…
niklasad1 May 4, 2023
300af78
Merge remote-tracking branch 'origin/main' into na-staking-miner-trim…
niklasad1 May 5, 2023
25ff30b
doesnt work yet
niklasad1 May 5, 2023
32d7b0e
make it work wooo
niklasad1 May 8, 2023
dc77514
Merge remote-tracking branch 'origin/main' into na-staking-miner-trim…
niklasad1 May 8, 2023
db645bf
cleanup
niklasad1 May 8, 2023
1367088
cargo fmt
niklasad1 May 8, 2023
1c6759a
rename macro
niklasad1 May 8, 2023
20c0be5
fix warnings
niklasad1 May 8, 2023
41b99a9
ci: staking-miner-playground --features test-trimming
niklasad1 May 8, 2023
cc65939
Update src/epm.rs
niklasad1 May 8, 2023
a666181
cargo fmt-2022-11-06
niklasad1 May 9, 2023
52d7e38
Merge remote-tracking branch 'origin/na-staking-miner-trimming-test' …
niklasad1 May 9, 2023
2a3f8bb
cleanup
niklasad1 May 9, 2023
77ec1cf
Update staking-miner-playground/node/src/chain_spec.rs
niklasad1 May 17, 2023
caf4396
address grumbles
niklasad1 May 17, 2023
b0e80c2
Merge remote-tracking branch 'origin/na-staking-miner-trimming-test' …
niklasad1 May 17, 2023
b3b0ccd
Update src/epm.rs
niklasad1 May 18, 2023
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
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ nightly-test:
- cd -
- rm -rf polkadot
- cd staking-miner-playground
- cargo build --release
- cargo build --release --features test-trimming
- mv ./target/release/staking-miner-playground /usr/bin
- staking-miner-playground --version
- cd -
Expand Down
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ hyper = { version = "0.14.25", features = ["server", "http1", "http2", "tcp"] }
once_cell = "1.17"

[dev-dependencies]
anyhow = "1"
assert_cmd = "2.0"
sp-storage = "11.0.0"
regex = "1"
Expand Down
30 changes: 15 additions & 15 deletions src/commands/monitor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -313,14 +313,14 @@ where
.timed()
.await
{
(Ok(miner_solution), elapsed) => {
(Ok(mined_solution), elapsed) => {
// check that the solution looks valid:
miner_solution.feasibility_check()?;
mined_solution.feasibility_check()?;

// and then get the values we need from it:
let solution = miner_solution.solution();
let score = miner_solution.score();
let size = miner_solution.size();
let solution = mined_solution.solution();
let score = mined_solution.score();
let size = mined_solution.size();

let elapsed_ms = elapsed.as_millis();
let encoded_len = solution.encoded_size();
Expand All @@ -333,16 +333,16 @@ where
.await?;

log::info!(
target: LOG_TARGET,
"Mined solution with {:?} size: {:?} round: {:?} at: {}, took: {} ms, len: {:?}, weight = {:?}",
score,
size,
round,
at.number(),
elapsed_ms,
encoded_len,
final_weight,
);
target: LOG_TARGET,
"Mined solution with {:?} size: {:?} round: {:?} at: {}, took: {} ms, len: {:?}, weight = {:?}",
score,
size,
round,
at.number(),
elapsed_ms,
encoded_len,
final_weight,
);

prometheus::set_length(encoded_len);
prometheus::set_weight(final_weight);
Expand Down
8 changes: 8 additions & 0 deletions src/epm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,14 @@ where
let voters = snapshot.voters.clone();
let targets = snapshot.targets.clone();

log::trace!(
target: LOG_TARGET,
"mine solution: desired_targets={}, voters={}, targets={}",
desired_targets,
voters.len(),
targets.len()
);

let blocking_task = tokio::task::spawn_blocking(move || match solver {
Solver::SeqPhragmen { iterations } => {
BalanceIterations::set(iterations);
Expand Down
Loading