Skip to content

Commit afee4e1

Browse files
authored
Merge pull request #285 from DMDcoin/0.12
0.12
2 parents e7e7461 + 8c51b6c commit afee4e1

33 files changed

+555
-308
lines changed

CHANGELOG.md

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,41 @@
1+
2+
## Diamond Node Software 0.12.6
3+
4+
- reduced Trace Log output for tracing devp2p propagation
5+
- removed tests for supporting for outdated clients that do not support large requests
6+
7+
8+
## Diamond Node Software 0.12.5
9+
10+
- now announcing availability before announcing IP address
11+
12+
## Diamond Node Software 0.12.4
13+
14+
- [Key Gen Transaction do not require block triggers anymore, there is now also a time trigger](https://github.com/DMDcoin/diamond-node/issues/160)
15+
16+
## Diamond Node Software 0.12.3
17+
18+
- Refactored KeyGenTransactions.
19+
- Nonces from the Queue are now respected for Key Gen Transactions.
20+
21+
## Diamond Node Software 0.12.2
22+
23+
- [Hotfix: Nodes not fast enough to write parts (keygen)](https://github.com/DMDcoin/diamond-node/issues/280)
24+
25+
## Diamond Node Software 0.12.1
26+
27+
- Logging improvements
28+
- Fixed a bug, where handshakes, that get upgraded to sessions, deregister there stream.
29+
30+
31+
## Diamond Node Software 0.12.0
32+
33+
- New Versioning Scheme: Since Open Ethereum did not get a new update, diamond-node will not mention 3.3.5 anymore
34+
- [race condition: Incoming data from peer that gets disconnected leads to crash](https://github.com/DMDcoin/diamond-node/issues/275)
35+
- [not joining hbbft epoch after sync has finished](https://github.com/DMDcoin/diamond-node/issues/270)
36+
- [diamond front running resistance](https://github.com/DMDcoin/diamond-node/issues/89)
37+
- [Transaction fees distribution](https://github.com/DMDcoin/diamond-node/issues/40)
38+
139
## Diamond Node Software 3.3.5-hbbft-0.11.8
240
- [deregister_session_stream can cause deadlocks](https://github.com/DMDcoin/diamond-node/issues/267)
341

Cargo.lock

Lines changed: 64 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
description = "Diamond Node"
33
name = "diamond-node"
44
# NOTE Make sure to update util/version/Cargo.toml as well
5-
version = "3.3.5-hbbft-0.11.8"
5+
version = "0.12.6"
66
license = "GPL-3.0"
77
authors = [
88
"bit.diamonds developers",
@@ -75,7 +75,7 @@ kvdb = "0.1"
7575
kvdb-rocksdb = "0.1.3"
7676
journaldb = { path = "crates/db/journaldb" }
7777
stats = { path = "crates/util/stats" }
78-
prometheus = "0.13.3"
78+
prometheus = "0.14"
7979
fs-swap = "0.2.6"
8080
net2 = "0.2.38"
8181

bin/oe/informant.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,8 @@ impl<T: InformantData> Informant<T> {
273273
false => t,
274274
};
275275

276-
info!(target: "import", "{}{} {} {} {}",
276+
info!(target: "import", "#{} {} {} {} {} {}",
277+
chain_info.best_block_number /* Block */,
277278
match importing {
278279
true => match snapshot_sync {
279280
false => format!("Syncing {} {} {} {}+{} Qed",

bin/oe/run.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,16 @@ impl ChainSyncing for SyncProviderWrapper {
154154
Some(client_arc) => {
155155
is_major_importing(Some(sync_arc.status().state), client_arc.queue_info())
156156
}
157-
None => true,
157+
None => {
158+
debug!(target: "sync", "is_major_syncing: Client has been destroyed.");
159+
true
160+
}
158161
},
159162
// We also indicate the "syncing" state when the SyncProvider has already been destroyed.
160-
None => true,
163+
None => {
164+
debug!(target: "sync", "is_major_syncing: sync_provider has been destroyed.");
165+
true
166+
}
161167
}
162168
}
163169

crates/ethcore/src/engines/hbbft/contracts/keygen_history.rs

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -211,25 +211,8 @@ impl<'a> SecretKey for KeyPairWrapper {
211211

212212
pub fn all_parts_acks_available(
213213
client: &dyn EngineClient,
214-
block_timestamp: u64,
215214
num_validators: usize,
216215
) -> Result<bool, CallError> {
217-
// backward compatibility:
218-
// this is a performance improvement introduced on the DMD Alpha Testnet.
219-
// more about https://github.com/DMDcoin/openethereum-3.x/issues/71
220-
// this piece of code exists only for the DMD public alpha testnet,
221-
// in order to support the v1 protocol version.
222-
// since the v2 protocol version is better,
223-
// v1 should be never used.
224-
// remove the code:
225-
// see: https://github.com/DMDcoin/openethereum-3.x/issues/72
226-
227-
let trigger_timestamp: u64 = 1646395200; // Friday, March 4, 2022 12:00:00 PM
228-
229-
if block_timestamp > 0 && trigger_timestamp > 0 && block_timestamp < trigger_timestamp {
230-
return Ok(true);
231-
}
232-
233216
let c = BoundContract::bind(client, BlockId::Latest, *KEYGEN_HISTORY_ADDRESS);
234217
let (num_parts, num_acks) = call_const_key_history!(c, get_number_of_key_fragments_written)?;
235218
Ok(num_parts.low_u64() == (num_validators as u64)

0 commit comments

Comments
 (0)