Skip to content

Commit b0b0da8

Browse files
aleksussmrLSD
andauthored
Release 3.10.1 (#1066)
### Additions - Added floor gas calculation for transactions to be aligned with EIP-7623 by [@aleksuss]. ([#1064]) ### Changes - Updated the intrinsic gas calculation for EIP-7702 transactions by [@aleksuss]. ([#1063]) - Bumped the rust edition to 2024 by [@aleksuss]. ([#1059]) - Some `modexp` and `aurora-evm` types were re-exported in precompiles by [@mrLSD]. ([#1060] [#1061]) [#1059]: #1059 [#1060]: #1060 [#1061]: #1061 [#1063]: #1063 [#1064]: #1064 --------- Co-authored-by: Evgeny Ukhanov <evgeny@aurora.dev>
1 parent 9d1e40e commit b0b0da8

File tree

148 files changed

+1483
-914
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

148 files changed

+1483
-914
lines changed

.github/workflows/builds.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@ jobs:
1414
with:
1515
metrics: cpu,network,memory,disk,io
1616
- name: Clone the repository
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v6
1818
- name: Install Rust
19-
uses: actions-rs/toolchain@v1
19+
uses: dtolnay/rust-toolchain@stable
2020
with:
2121
toolchain: stable
22-
override: true
2322
- name: Install dependencies
2423
run: scripts/ci-deps/install-wasm-opt.sh
2524
- name: Install cargo-make

.github/workflows/lints.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
with:
2323
metrics: cpu,network,memory,disk,io
2424
- name: Clone the repository
25-
uses: actions/checkout@v4
25+
uses: actions/checkout@v6
2626
- name: Install dependencies
2727
run: scripts/ci-deps/native.sh
2828
- name: Setup Rust cache
@@ -48,7 +48,7 @@ jobs:
4848
with:
4949
metrics: cpu,network,memory,disk,io
5050
- name: Clone the repository
51-
uses: actions/checkout@v4
51+
uses: actions/checkout@v6
5252
- name: Install dependencies
5353
run: scripts/ci-deps/native.sh
5454
- name: Setup Node and cache

.github/workflows/scheduled_lints.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
with:
1919
metrics: cpu,network,memory,disk,io
2020
- name: Clone the repository
21-
uses: actions/checkout@v4
21+
uses: actions/checkout@v6
2222
- name: Install Rust toolchain
2323
uses: actions-rust-lang/setup-rust-toolchain@v1
2424
with:
@@ -47,6 +47,8 @@ jobs:
4747
run: cargo +stable make -V || cargo +stable install cargo-make
4848
- name: Run tests
4949
run: cargo make test
50+
env:
51+
RUST_TEST_THREADS: 32 # decrease the number of the test threads to reduce the overall load on the VM and prevent the occasional failure of the tests.
5052
- uses: 8398a7/action-slack@v3
5153
if: failure()
5254
with:
@@ -65,7 +67,7 @@ jobs:
6567
with:
6668
metrics: cpu,network,memory,disk,io
6769
- name: Clone the repository
68-
uses: actions/checkout@v4
70+
uses: actions/checkout@v6
6971
- name: Install dependencies
7072
run: scripts/ci-deps/native.sh
7173
- name: Setup Rust cache

.github/workflows/tests.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
with:
1919
metrics: cpu,network,memory,disk,io
2020
- name: Clone the repository
21-
uses: actions/checkout@v4
21+
uses: actions/checkout@v6
2222
- uses: dtolnay/rust-toolchain@stable
2323
- name: Setup Rust cache
2424
uses: Swatinem/rust-cache@v2
@@ -40,6 +40,8 @@ jobs:
4040
run: scripts/ci-deps/install-wasm-opt.sh
4141
- name: Run tests
4242
run: cargo make test-flow
43+
env:
44+
RUST_TEST_THREADS: 32 # decrease the number of the test threads to reduce the overall load on the VM and prevent the occasional failure of the tests.
4345

4446
test_modexp:
4547
name: Test modexp suite
@@ -51,7 +53,7 @@ jobs:
5153
with:
5254
metrics: cpu,network,memory,disk,io
5355
- name: Clone the repository
54-
uses: actions/checkout@v4
56+
uses: actions/checkout@v6
5557
- name: Install dependencies
5658
run: scripts/ci-deps/native.sh
5759
- name: Setup Rust cache
@@ -79,7 +81,7 @@ jobs:
7981
with:
8082
metrics: cpu,network,memory,disk,io
8183
- name: Clone the repository
82-
uses: actions/checkout@v4
84+
uses: actions/checkout@v6
8385
- name: Install dependencies
8486
run: scripts/ci-deps/native.sh
8587
- name: Setup Rust cache
@@ -96,4 +98,3 @@ jobs:
9698
env:
9799
CARGO_TERM_COLOR: always
98100
CARGO_INCREMENTAL: 0
99-
NEAR_ENABLE_SANDBOX_LOG: 1

CHANGES.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [3.10.1] 2026-01-23
11+
12+
### Additions
13+
14+
- Added floor gas calculation for transactions to be aligned with EIP-7623 by [@aleksuss]. ([#1064])
15+
16+
### Changes
17+
18+
- Updated the intrinsic gas calculation for EIP-7702 transactions by [@aleksuss]. ([#1063])
19+
- Bumped the rust edition to 2024 by [@aleksuss]. ([#1059])
20+
- Some `modexp` and `aurora-evm` types were re-exported in precompiles by [@mrLSD]. ([#1060] [#1061])
21+
22+
[#1059]: https://github.com/aurora-is-near/aurora-engine/pull/1059
23+
[#1060]: https://github.com/aurora-is-near/aurora-engine/pull/1060
24+
[#1061]: https://github.com/aurora-is-near/aurora-engine/pull/1061
25+
[#1063]: https://github.com/aurora-is-near/aurora-engine/pull/1063
26+
[#1064]: https://github.com/aurora-is-near/aurora-engine/pull/1064
27+
1028
## [3.10.0] 2026-01-14
1129

1230
### Additions

Cargo.lock

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

Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[workspace.package]
22
authors = ["Aurora Labs <hello@aurora.dev>"]
3-
edition = "2021"
3+
edition = "2024"
44
keywords = ["aurora", "engine", "evm", "blockchain"]
55
homepage = "https://github.com/aurora-is-near/aurora-engine"
66
repository = "https://github.com/aurora-is-near/aurora-engine"
@@ -13,10 +13,10 @@ aurora-engine = { path = "engine", default-features = false }
1313
aurora-engine-hashchain = { path = "engine-hashchain", default-features = false }
1414
aurora-engine-modexp = { path = "engine-modexp", version = "1.2.0", default-features = false }
1515
aurora-engine-precompiles = { path = "engine-precompiles", version = "2.0.0", default-features = false }
16-
aurora-engine-sdk = { path = "engine-sdk", version = "2.0.0", default-features = false }
16+
aurora-engine-sdk = { path = "engine-sdk", version = "2.0.1", default-features = false }
1717
aurora-engine-test-doubles = { path = "engine-test-doubles" }
18-
aurora-engine-transactions = { path = "engine-transactions", version = "1.3.0", default-features = false }
19-
aurora-engine-types = { path = "engine-types", version = "2.0.0", default-features = false }
18+
aurora-engine-transactions = { path = "engine-transactions", version = "1.4.0", default-features = false }
19+
aurora-engine-types = { path = "engine-types", version = "3.0.0", default-features = false }
2020
aurora-engine-workspace = { path = "engine-workspace" }
2121
engine-standalone-storage = { path = "engine-standalone-storage" }
2222
engine-standalone-tracing = { path = "engine-standalone-tracing", default-features = false, features = ["impl-serde"] }
@@ -26,7 +26,7 @@ ark-bn254 = { version = "0.5", default-features = false }
2626
ark-serialize = { version = "0.5", default-features = false }
2727
ark-ec = { version = "0.5", default-features = false }
2828
ark-ff = { version = "0.5", default-features = false }
29-
aurora-evm = { version = "2", default-features = false }
29+
aurora-evm = { version = "2.2.1", default-features = false }
3030
base64 = { version = "0.22", default-features = false, features = ["alloc"] }
3131
bitflags = { version = "1", default-features = false }
3232
blst = "0.3"
@@ -55,7 +55,7 @@ num = { version = "0.4", default-features = false, features = ["alloc"] }
5555
postgres = "0.19"
5656
primitive-types = { version = "0.13", default-features = false, features = ["rlp", "serde_no_std"] }
5757
p256 = { version = "0.13", default-features = false }
58-
rand = "0.8"
58+
rand = "0.9"
5959
ripemd = { version = "0.1", default-features = false }
6060
rlp = { version = "0.6", default-features = false }
6161
rocksdb = { version = "0.21", default-features = false }

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.10.0
1+
3.10.1

engine-hashchain/src/hashchain.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
use crate::{bloom::Bloom, error::BlockchainHashchainError, merkle::StreamCompactMerkleTree};
21
use aurora_engine_sdk::keccak;
32
use aurora_engine_types::{
3+
Cow, Vec,
44
account_id::AccountId,
5-
borsh::{self, io, BorshDeserialize, BorshSerialize},
5+
borsh::{self, BorshDeserialize, BorshSerialize, io},
66
format,
77
types::RawH256,
8-
Cow, Vec,
98
};
109

10+
use crate::{bloom::Bloom, error::BlockchainHashchainError, merkle::StreamCompactMerkleTree};
11+
1112
/// Blockchain Hashchain.
1213
/// Continually keeps track of the previous block hashchain through the blocks heights.
1314
#[derive(Debug, Clone, PartialEq, Eq)]

engine-hashchain/src/merkle.rs

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
use aurora_engine_sdk::keccak;
22
use aurora_engine_types::{
3+
Vec,
34
borsh::{BorshDeserialize, BorshSerialize},
45
types::RawH256,
5-
Vec,
66
};
77

88
/// Stream Compact Merkle Tree.
9-
/// It can be feed by a stream of hashes (leaves) adding them to the right of the tree.
9+
/// It can be fed by a stream of hashes (leaves) adding them to the right of the tree.
1010
/// Internally, compacts full binary subtrees maintaining only the growing branch.
1111
/// Space used is O(log n) where n is the number of leaf hashes added. It is usually less.
1212
#[derive(BorshSerialize, BorshDeserialize, Debug, Clone, PartialEq, Eq)]
@@ -51,7 +51,7 @@ impl StreamCompactMerkleTree {
5151
let right_subtree = &self.subtrees[index];
5252
let left_subtree = &self.subtrees[index - 1];
5353

54-
// same height means they are siblings so we can compact them
54+
// the same height means they are siblings so we can compact them
5555
if left_subtree.height == right_subtree.height {
5656
let father_subtree = CompactMerkleSubtree {
5757
height: left_subtree.height + 1,
@@ -64,13 +64,14 @@ impl StreamCompactMerkleTree {
6464

6565
index -= 1;
6666
}
67-
// all remaining subtrees have different heights so we can't compact anything else
67+
// all remaining subtrees have different heights, so we can't compact anything else
6868
else {
69-
debug_assert!(self
70-
.subtrees
71-
.iter()
72-
.zip(self.subtrees.iter().skip(1))
73-
.all(|(left, right)| left.height > right.height));
69+
debug_assert!(
70+
self.subtrees
71+
.iter()
72+
.zip(self.subtrees.iter().skip(1))
73+
.all(|(left, right)| left.height > right.height)
74+
);
7475
break;
7576
}
7677
}
@@ -91,7 +92,7 @@ impl StreamCompactMerkleTree {
9192
while index >= 1 {
9293
let left_subtree = &self.subtrees[index - 1];
9394

94-
// same height means they are siblings so we can compact hashes
95+
// the same height means they are siblings so we can compact hashes
9596
if left_subtree.height == right_subtree.height {
9697
right_subtree.hash = keccak(&[left_subtree.hash, right_subtree.hash].concat()).0;
9798
index -= 1;
@@ -235,7 +236,11 @@ mod tests {
235236

236237
let merkle_tree_hash = merkle_tree.compute_hash();
237238

238-
assert_eq!(merkle_tree.subtrees.len(), 1, "1 and 2 should be compacted, 3 and 4 also, and then both resulting should be compacted too.");
239+
assert_eq!(
240+
merkle_tree.subtrees.len(),
241+
1,
242+
"1 and 2 should be compacted, 3 and 4 also, and then both resulting should be compacted too."
243+
);
239244
assert_eq!(merkle_tree.subtrees[0].hash, expected_merkle_tree_hash);
240245
assert_eq!(merkle_tree_hash, expected_merkle_tree_hash);
241246
}

0 commit comments

Comments
 (0)