Skip to content

Commit 1d0f986

Browse files
committed
Merge branch 'aspect-master' into wallet-daemon
# Conflicts: # Cargo.lock # Cargo.toml # wallet/native/src/main.rs
2 parents 785f772 + fce6230 commit 1d0f986

File tree

476 files changed

+13614
-3290
lines changed

Some content is hidden

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

476 files changed

+13614
-3290
lines changed

.github/workflows/ci.yaml

Lines changed: 22 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,8 @@ jobs:
1818
- name: Install stable toolchain
1919
uses: dtolnay/rust-toolchain@stable
2020

21-
- name: Cache
22-
uses: actions/cache@v4
23-
with:
24-
path: |
25-
~/.cargo/bin/
26-
~/.cargo/registry/index/
27-
~/.cargo/registry/cache/
28-
~/.cargo/git/db/
29-
target/
30-
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
21+
- name: Set up cache
22+
uses: Swatinem/rust-cache@v2
3123

3224
- name: Run cargo check
3325
run: cargo check --tests --workspace --benches
@@ -100,36 +92,27 @@ jobs:
10092
uses: Swatinem/rust-cache@v2
10193

10294
- name: Install cargo-nextest
103-
run: cargo install cargo-nextest
104-
105-
- name: Cache
106-
uses: actions/cache@v4
95+
uses: taiki-e/install-action@v2
10796
with:
108-
path: |
109-
~/.cargo/bin/
110-
~/.cargo/registry/index/
111-
~/.cargo/registry/cache/
112-
~/.cargo/git/db/
113-
target/
114-
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
97+
tool: cargo-nextest
11598

11699
- name: Run cargo build with devnet-prealloc feature
117-
run: cargo build --release --features devnet-prealloc --workspace --all --tests --benches
100+
run: cargo build --features devnet-prealloc --workspace --all --tests --benches
118101

119102
- name: Run cargo test regular features
120-
run: cargo nextest run --release --workspace
103+
run: cargo nextest run --workspace
121104

122105
- name: Run cargo doc tests
123-
run: cargo test --doc --release --workspace
106+
run: cargo test --doc --workspace
124107

125108
- name: Run cargo test on kaspa-hashes without asm
126-
run: cargo nextest run --release -p kaspa-hashes --features=no-asm --benches
109+
run: cargo nextest run -p kaspa-hashes --features=no-asm --benches
127110

128111
- name: Run cargo doc tests with features=no-asm on kaspa-hashes
129-
run: cargo test --doc --release -p kaspa-hashes --features=no-asm
112+
run: cargo test --doc -p kaspa-hashes --features=no-asm
130113

131114
- name: Run cargo doc
132-
run: cargo doc --release --no-deps --workspace
115+
run: cargo doc --no-deps --workspace
133116
- name: Run kip-10 example
134117
run: cargo run --example kip-10
135118

@@ -200,16 +183,8 @@ jobs:
200183
with:
201184
components: rustfmt, clippy
202185

203-
- name: Cache
204-
uses: actions/cache@v4
205-
with:
206-
path: |
207-
~/.cargo/bin/
208-
~/.cargo/registry/index/
209-
~/.cargo/registry/cache/
210-
~/.cargo/git/db/
211-
target/
212-
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
186+
- name: Set up cache
187+
uses: Swatinem/rust-cache@v2
213188

214189
- name: Run cargo fmt
215190
run: cargo fmt --all -- --check
@@ -259,16 +234,8 @@ jobs:
259234
- name: Add wasm32 target
260235
run: rustup target add wasm32-unknown-unknown
261236

262-
- name: Cache
263-
uses: actions/cache@v4
264-
with:
265-
path: |
266-
~/.cargo/bin/
267-
~/.cargo/registry/index/
268-
~/.cargo/registry/cache/
269-
~/.cargo/git/db/
270-
target/
271-
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
237+
- name: Set up cache
238+
uses: Swatinem/rust-cache@v2
272239

273240
# append here any new wasm32 crate not already covered by the existing checks
274241

@@ -324,7 +291,9 @@ jobs:
324291
uses: dtolnay/rust-toolchain@stable
325292

326293
- name: Install wasm-pack
327-
run: cargo install wasm-pack
294+
uses: taiki-e/install-action@v2
295+
with:
296+
tool: wasm-pack
328297

329298
- name: Add wasm32 target
330299
run: rustup target add wasm32-unknown-unknown
@@ -337,16 +306,8 @@ jobs:
337306
- name: Install NodeJS dependencies
338307
run: npm install --global typedoc typescript
339308

340-
- name: Cache
341-
uses: actions/cache@v4
342-
with:
343-
path: |
344-
~/.cargo/bin/
345-
~/.cargo/registry/index/
346-
~/.cargo/registry/cache/
347-
~/.cargo/git/db/
348-
target/
349-
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
309+
- name: Set up cache
310+
uses: Swatinem/rust-cache@v2
350311

351312
- name: Build wasm release
352313
run: |
@@ -375,19 +336,9 @@ jobs:
375336
- name: Install stable toolchain
376337
uses: dtolnay/rust-toolchain@stable
377338

378-
- name: Cache Cargo Build Outputs
379-
uses: actions/cache@v4
380-
with:
381-
path: |
382-
~/.cargo/bin/
383-
~/.cargo/registry/index/
384-
~/.cargo/registry/cache/
385-
~/.cargo/git/db/
386-
target/
387-
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
388-
restore-keys: |
389-
${{ runner.os }}-cargo-
390-
339+
- name: Set up Rust cache
340+
uses: Swatinem/rust-cache@v2
341+
391342
- name: Cache Toolchain
392343
uses: actions/cache@v4
393344
with:

.github/workflows/deploy.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,9 @@ jobs:
146146
147147
- name: Install gcc-multilib
148148
# gcc-multilib allows clang to find gnu libraries properly
149-
run: sudo apt install -y gcc-multilib
149+
run: |
150+
sudo apt-get update
151+
sudo apt install -y gcc-multilib
150152
151153
- name: Install stable toolchain
152154
if: steps.install_llvm.outcome == 'success' && steps.install_llvm.conclusion == 'success'

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ testing/integration/perflogs*
1515
Servers.toml
1616
release
1717
package-sizes.js
18+
rustbridge_*.log

.rustfmt.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ use_field_init_shorthand = true
33
use_try_shorthand = true
44
use_small_heuristics = "Max"
55
newline_style = "auto"
6-
edition = "2021"
6+
edition = "2024"

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ We welcome contributions of all sizes and there are many opportunities to contri
66

77
Reach out to `@Node Developers` in Discord in the [#development](https://discord.com/channels/599153230659846165/755890250643144788) channel.
88

9-
Follow along the R&D Telegram group [@kasparnd](https://t.me/c/kasparnd).
9+
Follow along the R&D Telegram group [@kasparnd](https://t.me/kasparnd).
1010

1111
## Quick summary
1212

0 commit comments

Comments
 (0)