Skip to content

Commit e130c3b

Browse files
Merge branch 'circlefin:main' into fix/arcup-tmp-dir-disk-space
2 parents 5a509f7 + 97f8da0 commit e130c3b

4 files changed

Lines changed: 23 additions & 9 deletions

File tree

‎crates/malachite-app/src/node.rs‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -849,11 +849,13 @@ impl App {
849849
#[cfg(not(feature = "byzantine"))]
850850
let ctx = ArcContext::new();
851851

852-
// Initialize the application state with the resolved spec and genesis block
853-
// NOTE: ArcContext is not always Copy, depending on whether
854-
// `byzantine` feature is enabled, so we clone it here to avoid a conditional compilation warning.
855-
#[allow(clippy::redundant_clone)]
856-
let mut state = State::builder(ctx.clone())
852+
#[cfg(feature = "byzantine")]
853+
let state_ctx = ctx.clone();
854+
#[cfg(not(feature = "byzantine"))]
855+
let state_ctx = ctx;
856+
857+
// Initialize the application state with the resolved spec and genesis block.
858+
let mut state = State::builder(state_ctx)
857859
.identity(identity.consensus.clone())
858860
.store(store.clone())
859861
.config(self.config.clone())

‎crates/test/integration/src/runner.rs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -679,6 +679,8 @@ fn build_node_execution_config(
679679
// Use the synchronous state-root path to avoid debug-only panics from
680680
// Reth proof worker pools that are unrelated to lifecycle behavior.
681681
config.engine.legacy_state_root_task_enabled = true;
682+
// These scenarios do not exercise precompile caching, whose memory is multiplied per node.
683+
config.engine.precompile_cache_disabled = true;
682684

683685
let reth_port_offset = u16::try_from(test_id * 100 + node_id.as_usize() * 10)
684686
.wrap_err("Reth port offset overflow")?;
@@ -776,6 +778,16 @@ mod tests {
776778
}
777779
}
778780

781+
#[test]
782+
fn execution_config_disables_precompile_cache() {
783+
let temp_dir = TempDir::new().expect("temp dir");
784+
let ipc = IpcPaths::new(temp_dir.path());
785+
let config = build_node_execution_config(0, NodeId::new(0), &ipc, LOCAL_DEV.clone())
786+
.expect("node config");
787+
788+
assert!(config.engine.precompile_cache_disabled);
789+
}
790+
779791
#[tokio::test]
780792
async fn consensus_bridge_uses_existing_handle_event_bus() {
781793
let handle = test_handle();

‎deployments/docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
# Logs: docker compose logs -f
66
#
77
# Required environment variables (see docs/running-an-arc-node.md#docker):
8-
# ARC_EXECUTION_IMAGE — EL Docker image (e.g. docker.cloudsmith.io/circle/arc-network/arc-execution:0.6.0)
9-
# ARC_CONSENSUS_IMAGE — CL Docker image (e.g. docker.cloudsmith.io/circle/arc-network/arc-consensus:0.6.0)
8+
# ARC_EXECUTION_IMAGE — EL Docker image (e.g. docker.cloudsmith.io/circle/arc-network/arc-execution:$ARC_VERSION — current release listed in the Versions table in docs/installation.md)
9+
# ARC_CONSENSUS_IMAGE — CL Docker image (e.g. docker.cloudsmith.io/circle/arc-network/arc-consensus:$ARC_VERSION — current release listed in the Versions table in docs/installation.md)
1010
# ARC_HOME — data directory on the host (e.g. ~/.arc)
1111

1212
services:

‎docs/installation.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Consult the table below to confirm which version to run for each network.
1515

1616
| Network | Version |
1717
|-------------|---------|
18-
| Arc Testnet | v0.6.0 |
18+
| Arc Testnet | v0.8.0 |
1919

2020
## Pre-built Binary
2121

@@ -61,7 +61,7 @@ source "$ARC_HOME/env"
6161
To install a specific version, run `arcup` with `--install`:
6262

6363
```sh
64-
arcup --install v0.6.0
64+
arcup --install v0.8.0
6565
```
6666

6767
Next, verify that the three Arc binaries are installed:

0 commit comments

Comments
 (0)