grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'main' into dev

Browse Source
This commit is contained in:
Jochen Müller 2021-04-21 15:42:43 +02:00
commit 6f5a00a642
7 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@ -1,3 +1,11 @@
## OpenEthereum v3.2.4
* Fix for Typed transaction broadcast.
## OpenEthereum v3.2.3
* Hotfix for berlin consensus error.
## OpenEthereum v3.2.2-rc.1 ## OpenEthereum v3.2.2-rc.1
Bug fixes: Bug fixes:

4
Cargo.lock generated
View File

@ -2835,7 +2835,7 @@ checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
[[package]] [[package]]
name = "openethereum" name = "openethereum"
version = "3.2.2-rc.1" version = "3.2.4"
dependencies = [ dependencies = [
"ansi_term 0.10.2", "ansi_term 0.10.2",
"atty", "atty",
@ -3191,7 +3191,7 @@ dependencies = [
[[package]] [[package]]
name = "parity-version" name = "parity-version"
version = "3.2.2-rc.1" version = "3.2.4"
dependencies = [ dependencies = [
"parity-bytes", "parity-bytes",
"rlp", "rlp",

2
Cargo.toml
View File

@ -2,7 +2,7 @@
description = "OpenEthereum" description = "OpenEthereum"
name = "openethereum" name = "openethereum"
# NOTE Make sure to update util/version/Cargo.toml as well # NOTE Make sure to update util/version/Cargo.toml as well
version = "3.2.2-rc.1" version = "3.2.4"
license = "GPL-3.0" license = "GPL-3.0"
authors = [ authors = [
"OpenEthereum developers", "OpenEthereum developers",

BIN
artifacts/openethereum-windows-v3.2.3.zip Normal file
View File

Binary file not shown.

5
crates/ethcore/src/executive.rs
View File

@ -240,7 +240,6 @@ impl<'a> CallCreateExecutive<'a> {
if schedule.eip2929 { if schedule.eip2929 {
let mut substate = Substate::from_access_list(&params.access_list); let mut substate = Substate::from_access_list(&params.access_list);
substate.access_list.insert_address(params.address); substate.access_list.insert_address(params.address);
substate.access_list.insert_address(params.sender);
substate substate
} else { } else {
Substate::default() Substate::default()
@ -1146,9 +1145,11 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> {
if schedule.eip2929 { if schedule.eip2929 {
access_list.insert_address(sender); access_list.insert_address(sender);
for (address, _) in self.machine.builtins() { for (address, builtin) in self.machine.builtins() {
if builtin.is_active(self.info.number) {
access_list.insert_address(*address); access_list.insert_address(*address);
} }
}
if schedule.eip2930 { if schedule.eip2930 {
// optional access list // optional access list
if let TypedTransaction::AccessList(al_tx) = t.as_unsigned() { if let TypedTransaction::AccessList(al_tx) = t.as_unsigned() {

8
crates/ethcore/sync/src/chain/propagator.rs
View File

@ -238,15 +238,15 @@ impl SyncPropagator {
for tx in &transactions { for tx in &transactions {
let hash = tx.hash(); let hash = tx.hash();
if to_send.contains(&hash) { if to_send.contains(&hash) {
let appended = tx.rlp_append(&mut packet);
packet.append_raw_checked(&tx.encode(), 1, MAX_TRANSACTION_PACKET_SIZE); pushed += 1;
if !appended { // this is not hard limit and we are okay with it. Max default tx size is 300k.
if packet.as_raw().len() >= MAX_TRANSACTION_PACKET_SIZE {
// Maximal packet size reached just proceed with sending // Maximal packet size reached just proceed with sending
debug!(target: "sync", "Transaction packet size limit reached. Sending incomplete set of {}/{} transactions.", pushed, to_send.len()); debug!(target: "sync", "Transaction packet size limit reached. Sending incomplete set of {}/{} transactions.", pushed, to_send.len());
to_send = to_send.into_iter().take(pushed).collect(); to_send = to_send.into_iter().take(pushed).collect();
break; break;
} }
pushed += 1;
} }
} }
packet.finalize_unbounded_list(); packet.finalize_unbounded_list();

2
crates/util/version/Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
name = "parity-version" name = "parity-version"
# NOTE: this value is used for OpenEthereum version string (via env CARGO_PKG_VERSION) # NOTE: this value is used for OpenEthereum version string (via env CARGO_PKG_VERSION)
version = "3.2.2-rc.1" version = "3.2.4"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
build = "build.rs" build = "build.rs"