Skip to content

Commit 0286a59

Browse files
authored
Merge branch 'main' into cian/add-tier1-tracing-spans
2 parents 41e9431 + f50c019 commit 0286a59

File tree

9 files changed

+205
-202
lines changed

9 files changed

+205
-202
lines changed

.claude/skills/ev-reth-core.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ The chainspec parser supports Evolve-specific extras via `EvolveEip1559Config`:
9797
## Development Commands
9898

9999
```bash
100-
make build # Release build
101-
make run-dev # Run with debug logs
102-
make test-node # Test node crate
100+
just build # Release build
101+
just run-dev # Run with debug logs
102+
just test-node # Test node crate
103103
```
104104

105105
## Exploration Starting Points

.claude/skills/ev-reth-evolve.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ Executed and included in block
9797
## Development Commands
9898

9999
```bash
100-
make test-evolve
100+
just test-evolve
101101
# Or directly:
102102
cargo test -p evolve-ev-reth
103103
```

.claude/skills/ev-reth-testing.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,9 @@ pub const TEST_BASE_FEE: u64 = 0;
142142
## Development Commands
143143

144144
```bash
145-
make test # Run all tests
146-
make test-verbose # Run with output
147-
make test-integration # Integration tests only
145+
just test # Run all tests
146+
just test-verbose # Run with output
147+
just test-integration # Integration tests only
148148

149149
# Run specific test
150150
cargo test -p ev-reth-tests test_payload_with_transactions

.github/workflows/docker.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,16 @@ jobs:
7474
export AR_aarch64_unknown_linux_gnu=aarch64-linux-gnu-ar
7575
export PKG_CONFIG_ALLOW_CROSS=1
7676
export DOCKER_TAG=${{ steps.set-tag.outputs.DOCKER_TAG }}
77-
make docker-build-push
77+
FEATURES="${FEATURES:-jemalloc}"
78+
PROFILE="${PROFILE:-release}"
79+
cross build --bin ev-reth --target x86_64-unknown-linux-gnu --features "$FEATURES" --profile "$PROFILE"
80+
JEMALLOC_SYS_WITH_LG_PAGE=16 cross build --bin ev-reth --target aarch64-unknown-linux-gnu --features "$FEATURES" --profile "$PROFILE"
81+
mkdir -p dist/bin/linux/amd64 dist/bin/linux/arm64
82+
cp "target/x86_64-unknown-linux-gnu/$PROFILE/ev-reth" dist/bin/linux/amd64/ev-reth
83+
cp "target/aarch64-unknown-linux-gnu/$PROFILE/ev-reth" dist/bin/linux/arm64/ev-reth
84+
docker buildx build --file ./Dockerfile.cross . \
85+
--platform linux/amd64,linux/arm64 \
86+
--tag "$DOCKER_IMAGE_NAME:$DOCKER_TAG" \
87+
--provenance=false \
88+
--sbom=false \
89+
--push

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
sudo apt-get install -y gcc-aarch64-linux-gnu
4242
4343
- name: Build release binary
44-
run: make build-maxperf
44+
run: RUSTFLAGS="-C target-cpu=native" cargo build --target ${{ matrix.target }} --profile release --features jemalloc,asm-keccak --bin ev-reth
4545

4646
- name: Create tarball
4747
if: matrix.os != 'windows-latest'

CLAUDE.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,27 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
55
## Common Development Commands
66

77
### Building
8-
- **Release build**: `make build`
9-
- **Debug build**: `make build-dev`
10-
- **Build all workspace members**: `make build-all`
8+
- **Release build**: `just build`
9+
- **Debug build**: `just build-dev`
10+
- **Build all workspace members**: `just build-all`
1111

1212
### Testing
13-
- **Run all tests**: `make test`
14-
- **Run tests with output**: `make test-verbose`
15-
- **Unit tests only**: `make test-unit`
16-
- **Integration tests**: `make test-integration`
17-
- **Test specific crate**: `make test-node`, `make test-evolve`, `make test-common`
13+
- **Run all tests**: `just test`
14+
- **Run tests with output**: `just test-verbose`
15+
- **Unit tests only**: `just test-unit`
16+
- **Integration tests**: `just test-integration`
17+
- **Test specific crate**: `just test-node`, `just test-evolve`, `just test-common`
1818

1919
### Code Quality
20-
- **Format code**: `make fmt`
21-
- **Check formatting**: `make fmt-check`
22-
- **Run linter**: `make lint`
23-
- **Run all checks**: `make check-all`
20+
- **Format code**: `just fmt`
21+
- **Check formatting**: `just fmt-check`
22+
- **Run linter**: `just lint`
23+
- **Run all checks**: `just check-all`
2424

2525
### Running the Node
26-
- **Run with defaults**: `make run`
27-
- **Run with debug logs**: `make run-dev`
28-
- **Direct execution**: `./target/release/lumen node --chain <CHAIN_SPEC> --datadir <DATA_DIR> --http --ws`
26+
- **Run with defaults**: `just run`
27+
- **Run with debug logs**: `just run-dev`
28+
- **Direct execution**: `./target/release/ev-reth node --chain <CHAIN_SPEC> --datadir <DATA_DIR> --http --ws`
2929

3030
## High-Level Architecture
3131

Makefile

Lines changed: 0 additions & 171 deletions
This file was deleted.

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,10 @@ git clone https://github.com/evstack/ev-reth.git
136136
cd ev-reth
137137

138138
# Build the project
139-
make build
139+
just build
140140

141141
# Run tests
142-
make test
142+
just test
143143
```
144144

145145
## Usage
@@ -534,18 +534,18 @@ ev-reth/
534534
├── etc/ # Configuration files
535535
│ └── ev-reth-genesis.json # Genesis configuration
536536
├── Cargo.toml # Workspace configuration
537-
├── Makefile # Build automation
537+
├── justfile # Build automation
538538
└── README.md # This file
539539
```
540540

541541
### Running Tests
542542

543543
```bash
544544
# Run all tests
545-
make test
545+
just test
546546

547547
# Run with verbose output
548-
make test-verbose
548+
just test-verbose
549549

550550
# Run specific test
551551
cargo test test_name
@@ -555,10 +555,10 @@ cargo test test_name
555555

556556
```bash
557557
# Debug build
558-
make build-dev
558+
just build-dev
559559

560560
# Run with debug logs
561-
make run-dev
561+
just run-dev
562562
```
563563

564564
## Troubleshooting

0 commit comments

Comments
 (0)