Skip to content

Commit edb842f

Browse files
authored
Merge pull request #3834 from ProvableHQ/release-4.2.0
[Release] Mainnet 4.2.0
2 parents 54d9eff + ca6f87a commit edb842f

Some content is hidden

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

86 files changed

+4173
-2203
lines changed

.cargo/config.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@ rustflags = [
44
# See here: https://github.com/rust-lang/rust/issues/71515
55
"-C", "link-arg=-fuse-ld=lld",
66
]
7+
8+
[env]
9+
CXXFLAGS = "-include cstdint" #TODO: remove once RocksDB 0.24 is released

.circleci/config.yml

Lines changed: 40 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -66,22 +66,29 @@ commands:
6666
parameters:
6767
cache_key:
6868
type: string
69-
default: v3.3.1-rust-1.83.0-snarkos-stable-cache
69+
default: v3.3.1-rust-1.88.0-snarkos-stable-cache
7070
steps:
7171
- run: set -e
7272
- run:
73-
name: Prepare environment and install dependencies
73+
name: Install sccache
7474
command: |
75-
export SCCACHE_CACHE_SIZE=200M
7675
export WORK_DIR="$CIRCLE_WORKING_DIRECTORY/.cache/sccache"
7776
export SCCACHE_DIR="$CIRCLE_WORKING_DIRECTORY/.cache/sccache"
77+
export SCCACHE_VERSION=v0.10.0
78+
export SCCACHE_PKG="sccache-$SCCACHE_VERSION-x86_64-unknown-linux-musl"
79+
7880
mkdir -p "$CIRCLE_WORKING_DIRECTORY/.bin"
79-
wget https://github.com/mozilla/sccache/releases/download/v0.3.0/sccache-v0.3.0-x86_64-unknown-linux-musl.tar.gz
80-
tar -C "$CIRCLE_WORKING_DIRECTORY/.bin" -xvf sccache-v0.3.0-x86_64-unknown-linux-musl.tar.gz
81-
mv $CIRCLE_WORKING_DIRECTORY/.bin/sccache-v0.3.0-x86_64-unknown-linux-musl/sccache $CIRCLE_WORKING_DIRECTORY/.bin/sccache
81+
wget "https://github.com/mozilla/sccache/releases/download/$SCCACHE_VERSION/$SCCACHE_PKG.tar.gz"
82+
tar -C "$CIRCLE_WORKING_DIRECTORY/.bin" -xvf "$SCCACHE_PKG.tar.gz"
83+
chmod +x "$CIRCLE_WORKING_DIRECTORY/.bin/$SCCACHE_PKG/sccache"
84+
mv "$CIRCLE_WORKING_DIRECTORY/.bin/$SCCACHE_PKG/sccache" "$CIRCLE_WORKING_DIRECTORY/.bin/sccache"
85+
rm -rf "$CIRCLE_WORKING_DIRECTORY/.cargo/registry"
86+
8287
export PATH="$PATH:$CIRCLE_WORKING_DIRECTORY/.bin"
8388
export RUSTC_WRAPPER="sccache"
84-
rm -rf "$CIRCLE_WORKING_DIRECTORY/.cargo/registry"
89+
- run:
90+
name: Install Debian packages
91+
command: |
8592
DEBIAN_FRONTEND=noninteractive sudo apt-get update
8693
DEBIAN_FRONTEND=noninteractive sudo apt-get install -y --no-install-recommends clang llvm-dev llvm lld pkg-config xz-utils make libssl-dev libssl-dev
8794
- restore_cache:
@@ -93,7 +100,7 @@ commands:
93100
parameters:
94101
cache_key:
95102
type: string
96-
default: v3.3.1-rust-1.83.0-snarkos-stable-cache
103+
default: v3.3.1-rust-1.88.0-snarkos-stable-cache
97104
steps:
98105
- run: (sccache -s||true)
99106
- run: set +e
@@ -169,19 +176,15 @@ commands:
169176
- run:
170177
name: "Install snarkos"
171178
command: |
172-
cargo install --locked --path .
179+
cargo install --locked --path . --features test_network
173180
- run:
174181
name: "Run DB backup test"
175182
timeout: 10m # Allow 10 minutes total
176183
command: |
177184
./.circleci/db_backup_ci.sh # run the db checkpoint test script first, and clean the dev ledgers afterwards
178-
snarkos clean --dev 0
179-
snarkos clean --dev 1
180-
snarkos clean --dev 2
181-
snarkos clean --dev 3
182185
- run:
183186
name: "Run block advancement test"
184-
imeout: 20m # Allow 20 minutes total
187+
timeout: 20m # Allow 20 minutes total
185188
command: |
186189
./.circleci/devnet_ci.sh << parameters.validators >> << parameters.clients >> << parameters.network_id >> << parameters.min_height >>
187190
- clear_environment:
@@ -195,7 +198,7 @@ commands:
195198
jobs:
196199
snarkos:
197200
executor: rust-docker
198-
resource_class: << pipeline.parameters.xlarge >>
201+
resource_class: << pipeline.parameters.twoxlarge >>
199202
steps:
200203
- run_serial:
201204
workspace_member: .
@@ -211,20 +214,12 @@ jobs:
211214

212215
cli:
213216
executor: rust-docker
214-
resource_class: << pipeline.parameters.xlarge >>
217+
resource_class: << pipeline.parameters.twoxlarge >>
215218
steps:
216219
- run_serial:
217220
workspace_member: cli
218221
cache_key: cli
219222

220-
display:
221-
executor: rust-docker
222-
resource_class: << pipeline.parameters.medium >>
223-
steps:
224-
- run_serial:
225-
workspace_member: display
226-
cache_key: v3.3.1-rust-1.83.0-display-cache
227-
228223
node:
229224
executor: rust-docker
230225
resource_class: << pipeline.parameters.twoxlarge >>
@@ -275,7 +270,7 @@ jobs:
275270

276271
node-consensus:
277272
executor: rust-docker
278-
resource_class: << pipeline.parameters.medium >>
273+
resource_class: << pipeline.parameters.large >>
279274
steps:
280275
- run_serial:
281276
workspace_member: node/consensus
@@ -345,6 +340,25 @@ jobs:
345340
workspace_member: .
346341
cache_key: v3.3.1-rust-1.88.0-devnet-test-cache
347342

343+
# Check crates that do not have any tests individually
344+
check-other-crates:
345+
executor: rust-docker
346+
resource_class: << pipeline.parameters.medium >>
347+
steps:
348+
- checkout
349+
- setup_environment:
350+
cache_key: v3.3.1-rust-1.88.0-check-other-crates-cache
351+
- run:
352+
name: Check snarkos-node-metrics crate
353+
no_output_timeout: 10m
354+
command: cargo check --package=snarkos-node-metrics --all-features
355+
- run:
356+
name: Check snarkos-display crate
357+
no_output_timeout: 10m
358+
command: cargo check --package=snarkos-node-metrics --all-features
359+
- clear_environment:
360+
cache_key: v3.3.1-rust-1.88.0-check-other-crates-cache
361+
348362
check-fmt:
349363
executor: rust-docker
350364
resource_class: << pipeline.parameters.medium >>
@@ -429,7 +443,6 @@ workflows:
429443
- snarkos
430444
- account
431445
- cli
432-
- display
433446
- node
434447
- node-bft
435448
- node-bft-events
@@ -448,6 +461,7 @@ workflows:
448461
- check-clippy
449462
- check-unused-dependencies
450463
- check-cargo-audit
464+
- check-other-crates
451465
- devnet-test
452466

453467
windows-workflow:
@@ -461,4 +475,3 @@ workflows:
461475
display,
462476
node
463477
]
464-

0 commit comments

Comments
 (0)