Skip to content

Commit 61902d1

Browse files
committed
Merge branch 'main' into fix/comment-edgecase-1892
2 parents 712f9a8 + 4101e3a commit 61902d1

File tree

189 files changed

+30952
-20607
lines changed

Some content is hidden

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

189 files changed

+30952
-20607
lines changed

.cargo/config.toml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
[alias]
22
clarinet-install = "install --path components/clarinet-cli --locked --force"
33
# clarity-sdk-wasm has its own test suite using wasm-pack-test
4-
# stacks-devnet-js is un tested and not actively maintained
5-
tst = "nextest run --workspace --no-fail-fast --locked --exclude clarinet-sdk-wasm --exclude stacks-devnet-js"
6-
cov = "llvm-cov nextest --workspace --locked --exclude clarinet-sdk-wasm --exclude stacks-devnet-js --lcov --output-path lcov.info"
7-
cov-dev = "llvm-cov nextest --workspace --locked --exclude clarinet-sdk-wasm --exclude stacks-devnet-js --html"
4+
tst = "nextest run --workspace --no-fail-fast --locked --exclude clarinet-sdk-wasm"
5+
cov = "llvm-cov nextest --workspace --locked --exclude clarinet-sdk-wasm --lcov --output-path lcov.info"
6+
cov-dev = "llvm-cov nextest --workspace --locked --exclude clarinet-sdk-wasm --html"
87
fmt-stacks = "fmt --all -- --config group_imports=StdExternalCrate,imports_granularity=Module"

.github/workflows/ci-sdk.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
uses: actions/checkout@v4
2828

2929
- name: Setup Rust toolchain
30-
run: rustup toolchain install stable --profile minimal --component rustfmt --target wasm32-unknown-unknown
30+
run: rustup toolchain install stable --profile minimal --component rustfmt,clippy --target wasm32-unknown-unknown
3131

3232
- name: Setup cache keys
3333
run: |

.github/workflows/ci.yaml

Lines changed: 5 additions & 147 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
run: |
4545
CARGO_VERSION=v$(grep "version" Cargo.toml | head -n 1 | cut -d\" -f2)
4646
if [[ "${CARGO_VERSION}" != "${LATEST_RELEASE}" ]]; then
47-
echo "::set-output name=TAG::${CARGO_VERSION}"
47+
echo "TAG=${CARGO_VERSION}" >> $GITHUB_OUTPUT
4848
echo "::warning::Will create release for version: ${CARGO_VERSION}"
4949
else
5050
echo "::warning::Will not create a release"
@@ -60,7 +60,7 @@ jobs:
6060
uses: actions/checkout@v4
6161

6262
- name: Install Rust toolchain
63-
run: rustup toolchain install stable --profile minimal
63+
run: rustup toolchain install stable --profile minimal --component rustfmt,clippy
6464

6565
- name: Setup cache keys
6666
shell: bash
@@ -295,9 +295,9 @@ jobs:
295295
id: variables
296296
run: |
297297
dir
298-
echo "::set-output name=version::${GITHUB_REF#refs/tags/v}"
299-
echo "::set-output name=KEYPAIR_NAME::gt-standard-keypair"
300-
echo "::set-output name=CERTIFICATE_NAME::gt-certificate"
298+
echo "version=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
299+
echo "KEYPAIR_NAME=gt-standard-keypair" >> $GITHUB_OUTPUT
300+
echo "CERTIFICATE_NAME=gt-certificate" >> $GITHUB_OUTPUT
301301
echo "SM_HOST=${{ secrets.SM_HOST }}" >> "$GITHUB_ENV"
302302
echo "SM_API_KEY=${{ secrets.SM_API_KEY }}" >> "$GITHUB_ENV"
303303
echo "SM_CLIENT_CERT_FILE=D:\\Certificate_pkcs12.p12" >> "$GITHUB_ENV"
@@ -386,147 +386,6 @@ jobs:
386386
name: clarinet-${{ env.SHORT_TARGET_NAME }}
387387
path: clarinet-${{ env.SHORT_TARGET_NAME }}.msi
388388

389-
dist_stacks_devnet_js:
390-
name: Build Stacks Devnet JS Distributions
391-
runs-on: ${{ matrix.os }}
392-
needs:
393-
- get_release_info
394-
strategy:
395-
fail-fast: false
396-
matrix:
397-
include:
398-
- os: ubuntu-latest
399-
platform: linux
400-
target: x86_64-unknown-linux-gnu
401-
architecture: x64
402-
libc: glibc
403-
- os: windows-latest
404-
platform: windows
405-
target: x86_64-pc-windows-msvc
406-
architecture: x64
407-
- os: macos-latest
408-
platform: darwin
409-
target: x86_64-apple-darwin
410-
architecture: x64
411-
- os: macos-latest
412-
platform: darwin
413-
target: aarch64-apple-darwin
414-
architecture: arm64
415-
- os: ubuntu-latest
416-
platform: linux
417-
target: x86_64-unknown-linux-musl
418-
architecture: x64
419-
libc: musl
420-
steps:
421-
- name: Configure git to use LF (Windows)
422-
if: matrix.os == 'windows-latest'
423-
run: |
424-
git config --global core.autocrlf false
425-
git config --global core.eol lf
426-
427-
- name: Checkout repository
428-
uses: actions/checkout@v4
429-
430-
- name: Install Rust toolchain
431-
run: rustup toolchain install stable --profile minimal --target ${{ matrix.target }}
432-
433-
- name: Setup cache keys
434-
shell: bash
435-
run: |
436-
if [ "$RUNNER_OS" == "Windows" ]; then
437-
RUST_VERSION=$(rustc -vV | sha256sum | cut -d ' ' -f1)
438-
else
439-
RUST_VERSION=$(rustc -vV | shasum -a 256 | cut -d ' ' -f1)
440-
fi
441-
echo "RUST_VERSION=$RUST_VERSION" >> $GITHUB_ENV
442-
443-
- name: Install and cache Node
444-
if: matrix.target != 'x86_64-unknown-linux-musl'
445-
uses: actions/setup-node@v4
446-
with:
447-
node-version: "18"
448-
# Host nodejs arch does not matter in our usecase for compiling cross-platform npm packages,
449-
# if enabled, this will fail after installing an arm64 nodejs runtime for an x86_64 arch macos system
450-
# architecture: ${{ matrix.architecture }}
451-
cache: npm
452-
cache-dependency-path: components/stacks-devnet-js/package-lock.json
453-
454-
- name: Cache cargo
455-
uses: actions/cache@v4
456-
with:
457-
path: |
458-
~/.cargo/bin/
459-
~/.cargo/registry/index/
460-
~/.cargo/registry/cache/
461-
~/.cargo/git/
462-
target/
463-
key: ${{ matrix.os }}-${{ matrix.target }}-${{ github.job }}-${{ env.RUST_VERSION }}-${{ hashFiles('./Cargo.lock') }}
464-
restore-keys: |
465-
${{ matrix.os }}-${{ matrix.target }}-${{ github.job }}-${{ env.RUST_VERSION }}-
466-
${{ matrix.os }}-${{ matrix.target }}-${{ github.job }}-
467-
468-
# Set environment variables required from cross compiling from macos-x86_64 to macos-arm64
469-
- name: Configure macos-arm64 cross compile config
470-
if: matrix.target == 'aarch64-apple-darwin'
471-
run: |
472-
echo "SDKROOT=$(xcrun -sdk macosx --show-sdk-path)" >> $GITHUB_ENV
473-
echo "MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx --show-sdk-platform-version)" >> $GITHUB_ENV
474-
475-
- name: Configure artifact names (libc)
476-
if: ${{ matrix.libc }}
477-
shell: bash
478-
run: |
479-
echo "SHORT_TARGET_NAME=${{ matrix.platform }}-${{ matrix.architecture }}-${{ matrix.libc }}" >> $GITHUB_ENV
480-
echo "PRE_GYP_TARGET_NAME=${{ matrix.platform }}-${{ matrix.architecture }}-${{ matrix.libc }}" >> $GITHUB_ENV
481-
482-
- name: Configure artifact names (not libc)
483-
if: ${{ ! matrix.libc }}
484-
shell: bash
485-
run: |
486-
echo "SHORT_TARGET_NAME=${{ matrix.platform }}-${{ matrix.architecture }}" >> $GITHUB_ENV
487-
echo "PRE_GYP_TARGET_NAME=${{ matrix.platform }}-${{ matrix.architecture }}-unknown" >> $GITHUB_ENV
488-
489-
- name: Build - Node
490-
if: matrix.target != 'x86_64-unknown-linux-musl'
491-
working-directory: components/stacks-devnet-js
492-
run: |
493-
npm install --ignore-scripts
494-
npm run build-${{ env.SHORT_TARGET_NAME }}
495-
496-
- name: Build - Node (linux-musl)
497-
if: matrix.target == 'x86_64-unknown-linux-musl'
498-
uses: docker://rust:alpine3.19
499-
env:
500-
RUSTFLAGS: -C target-feature=-crt-static
501-
with:
502-
entrypoint: /bin/sh
503-
args: -c "
504-
cd components/stacks-devnet-js &&
505-
apk add --update alpine-sdk musl-dev clang-dev llvm openssl-dev clang-static nodejs npm git &&
506-
npm install --ignore-scripts &&
507-
npm run build-${{ env.SHORT_TARGET_NAME }}"
508-
509-
- name: Compress node artifact
510-
if: github.event_name != 'pull_request' || matrix.target == 'x86_64-unknown-linux-gnu'
511-
shell: bash
512-
run: tar -C components/stacks-devnet-js -zcvf stacks-devnet-js-${{ env.PRE_GYP_TARGET_NAME }}.tar.gz native/index.node
513-
514-
- name: Upload node artifact
515-
if: github.event_name != 'pull_request' || matrix.target == 'x86_64-unknown-linux-gnu'
516-
uses: actions/upload-artifact@v4
517-
with:
518-
name: stacks-devnet-js-${{ env.PRE_GYP_TARGET_NAME }}
519-
path: stacks-devnet-js-${{ env.PRE_GYP_TARGET_NAME }}.tar.gz
520-
521-
- name: NPM Publish
522-
uses: JS-DevTools/npm-publish@v1
523-
if: matrix.target == 'x86_64-unknown-linux-gnu' && startsWith(github.ref, 'refs/heads/main') && needs.get_release_info.outputs.tag != ''
524-
with:
525-
package: components/stacks-devnet-js/package.json
526-
access: public
527-
greater-version-only: true
528-
token: ${{ secrets.NPM_TOKEN }}
529-
530389
dist_clarity_repl:
531390
name: Build Clarity REPL Distribution
532391
runs-on: ubuntu-latest
@@ -653,7 +512,6 @@ jobs:
653512
- get_release_info
654513
- sanity_check
655514
- cargo_test
656-
- dist_stacks_devnet_js
657515
- dist_clarity_repl
658516
- docker_images
659517
permissions:

.github/workflows/release-sdk.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ jobs:
3737

3838
- name: Publish sdk-wasm package
3939
run: npm publish -w components/clarinet-sdk-wasm/pkg-node -w components/clarinet-sdk-wasm/pkg-browser --provenance --access public
40-
env:
41-
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
4240

4341
- name: Install dependencies
4442
run: npm ci
@@ -48,5 +46,3 @@ jobs:
4846

4947
- name: Publish sdk package
5048
run: npm publish -w components/clarinet-sdk/node -w components/clarinet-sdk/browser --provenance --access public
51-
env:
52-
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ npm-debug.log*
1313
**/.requirements
1414
**/.cache
1515
**/.build
16-
components/stacks-devnet-js/dist
17-
components/stacks-devnet-js/build
1816
*.tar.gz
1917
!components/stacks-network/data/devnet_default_snapshot.tar.gz
2018
*.zip

CHANGELOG.md

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,71 @@
1+
# [3.7.0](https://github.com/hirosystems/clarinet/compare/v3.6.1...v3.7.0) (2025-09-23)
2+
3+
##### New Features
4+
5+
- Show stacks trace on test fail (#1982) (521dd0ed)
6+
- Warn if falling back to runtime cost perf (#1986) (807bc12b)
7+
8+
##### Bug Fixes
9+
10+
- Add contract-loading-costs to perf.data to match get_costs (#1998) (8b049844)
11+
- Better rate limiting handling and run all tests on stg (#2001) (988f0569)
12+
- Clarity2 block-height in info in epoch 3.2 (#1996) (baa15062)
13+
- Boot contracts deployment (#1990) (3422554b)
14+
15+
##### Refactors
16+
17+
- Remove dead code related to clarity-wasm (#1984) (5fab8df8)
18+
19+
##### Chores
20+
21+
- Update cargo dependencies (#1997) (22f13d02)
22+
- Remove cbtc example (#1987) (34a8e113)
23+
- Update new project package.json (#1983) (01ecf788)
24+
25+
# [3.6.1](https://github.com/hirosystems/clarinet/compare/v3.6.0...v3.6.1) (2025-09-11)
26+
27+
##### Bug Fixes
28+
29+
- Tracer stack handling (#1979) (e97c1c1b)
30+
31+
# [3.6.0](https://github.com/hirosystems/clarinet/compare/v3.5.0...v3.6.0) (2025-09-11)
32+
33+
##### New Features
34+
35+
- Show stack trace when a contract call fails (#1974) (47d41a67)
36+
- Add perf hook to generate cost flame graphs (#1940) (f877b908)
37+
- Parse contracts locally in mxs (#1947) (742e884b)
38+
39+
##### Documentation Changes
40+
41+
- Update readme contributing section (#1971) (812539ef)
42+
43+
##### Bug Fixes
44+
45+
- Format-ignore handling (#1973) (48fef8b0)
46+
- 'latest' serialization (#1972) (01df4834)
47+
- Contract name printed in console (#1962) (195fbe8a)
48+
- Custom boot contracts LSP (#1958) (06d0c99b)
49+
50+
# [3.5.0](https://github.com/hirosystems/clarinet/compare/v3.4.0...v3.5.0) (2025-08-08)
51+
52+
##### New Features
53+
54+
- Use latest explorer (#1954) (e6a624a5)
55+
- Custom boot contracts (#1915) (ae34a3dc)
56+
57+
##### Chores
58+
59+
- Make stacks_signer_keys significant for devnet diff (#1950) (017506eb)
60+
61+
##### Other Changes
62+
63+
- Add epoch tests (#1945) (9e78c066)
64+
65+
##### Refactors
66+
67+
- Rework session api reference (#1951) (b38a5ff2)
68+
169
# [3.4.0](https://github.com/hirosystems/clarinet/compare/v3.3.0...v3.4.0) (2025-07-31)
270

371
##### New Features

0 commit comments

Comments
 (0)