Skip to content

Commit bfea793

Browse files
author
tilo-14
committed
merge: resolve conflicts with main
- js/compressed-token/src/index.ts: keep both new exports (decompressInterface/decompressMint + createTransferInterfaceInstructions/sliceLast) - scripts/lint.sh: adopt main's subshell pattern, add token-idl and token-sdk linting
2 parents 897c1aa + 2644529 commit bfea793

524 files changed

Lines changed: 38059 additions & 14235 deletions

File tree

Some content is hidden

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

.entire/.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
tmp/
2+
settings.local.json
3+
metadata/
4+
logs/

.entire/settings.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"strategy": "manual-commit",
3+
"enabled": true,
4+
"telemetry": true
5+
}

.github/actionlint.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
self-hosted-runner:
22
# Labels of self-hosted runner in array of strings.
3-
labels:
4-
- buildjet-2vcpu-ubuntu-2204
5-
- buildjet-4vcpu-ubuntu-2204
6-
- buildjet-8vcpu-ubuntu-2204
7-
- buildjet-16vcpu-ubuntu-2204
8-
- warp-ubuntu-latest-x64-4x
3+
labels: []
94
# Configuration variables in array of strings defined in your repository or
105
# organization. `null` means disabling configuration variables check.
116
# Empty array means no configuration variable is allowed.

.github/workflows/delete-buildjet-cache.yml

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

.github/workflows/deploy-docs.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ on:
55
tags:
66
- 'compressed-token-*'
77
- 'stateless.js-*'
8+
branches:
9+
- 'main'
10+
- 'swen/pub-beta-cov'
11+
paths:
12+
- 'js/stateless.js/src/**'
13+
- 'js/compressed-token/src/**'
14+
workflow_dispatch: {}
815

916

1017
permissions:
@@ -53,6 +60,9 @@ jobs:
5360
- name: Build stateless.js
5461
run: cd js/stateless.js && pnpm run build
5562

63+
- name: Build compressed-token
64+
run: cd js/compressed-token && pnpm run build
65+
5666
- name: Generate TypeDoc for stateless.js
5767
run: npx typedoc --options typedoc.stateless.json
5868

.github/workflows/forester-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ env:
4444
jobs:
4545
test:
4646
name: Forester e2e test
47-
runs-on: warp-ubuntu-latest-x64-4x
48-
timeout-minutes: 60
47+
runs-on: ubuntu-latest
48+
timeout-minutes: 120
4949

5050
services:
5151
redis:
@@ -86,7 +86,7 @@ jobs:
8686

8787
compressible-tests:
8888
name: Forester compressible tests
89-
runs-on: warp-ubuntu-latest-x64-4x
89+
runs-on: ubuntu-latest
9090
timeout-minutes: 60
9191

9292
services:

.github/workflows/js-v2.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,13 @@ jobs:
9797
done
9898
echo "Tests passed on attempt $attempt"
9999
100-
- name: Run compressed-token ctoken tests with V2
100+
- name: Run compressed-token lighttoken tests with V2
101101
run: |
102-
echo "Running compressed-token ctoken tests with retry logic (max 2 attempts)..."
102+
echo "Running compressed-token lighttoken tests with retry logic (max 2 attempts)..."
103103
attempt=1
104104
max_attempts=2
105105
cd js/compressed-token
106-
until LIGHT_PROTOCOL_VERSION=V2 pnpm test:e2e:ctoken:all; do
106+
until LIGHT_PROTOCOL_VERSION=V2 pnpm test:e2e:lighttoken:all; do
107107
attempt=$((attempt + 1))
108108
if [ $attempt -gt $max_attempts ]; then
109109
echo "Tests failed after $max_attempts attempts"

.github/workflows/lint.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,11 @@ jobs:
3737
- name: Run linters
3838
run: |
3939
set -euxo pipefail
40-
rustup install nightly
41-
rustup target add x86_64-unknown-linux-gnu --toolchain nightly
42-
rustup component add --toolchain nightly rustfmt
43-
rustup component add --toolchain nightly clippy
40+
RUSTFMT_NIGHTLY_TOOLCHAIN=nightly-2025-10-26
41+
rustup install "$RUSTFMT_NIGHTLY_TOOLCHAIN"
42+
rustup target add x86_64-unknown-linux-gnu --toolchain "$RUSTFMT_NIGHTLY_TOOLCHAIN"
43+
rustup component add --toolchain "$RUSTFMT_NIGHTLY_TOOLCHAIN" rustfmt
44+
rustup component add --toolchain "$RUSTFMT_NIGHTLY_TOOLCHAIN" clippy
4445
rustup component add --toolchain 1.86-x86_64-unknown-linux-gnu clippy
46+
export RUSTFMT_NIGHTLY_TOOLCHAIN
4547
./scripts/lint.sh
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: metrics-contract
2+
3+
permissions:
4+
contents: read
5+
6+
on:
7+
workflow_dispatch:
8+
push:
9+
branches: [main]
10+
paths:
11+
- "forester/metrics-contract.json"
12+
- "forester/src/metrics.rs"
13+
- "forester/tests/metrics_contract_test.rs"
14+
- ".github/workflows/metrics-contract.yml"
15+
pull_request:
16+
branches: [main]
17+
paths:
18+
- "forester/metrics-contract.json"
19+
- "forester/src/metrics.rs"
20+
- "forester/tests/metrics_contract_test.rs"
21+
- ".github/workflows/metrics-contract.yml"
22+
types: [opened, synchronize, reopened, ready_for_review]
23+
24+
concurrency:
25+
group: ${{ github.workflow }}-${{ github.ref }}
26+
cancel-in-progress: true
27+
28+
jobs:
29+
check:
30+
name: Verify metrics contract
31+
runs-on: ubuntu-latest
32+
timeout-minutes: 20
33+
steps:
34+
- uses: actions/checkout@v6
35+
with:
36+
submodules: true
37+
38+
- name: Install system dependencies
39+
run: |
40+
sudo apt-get update
41+
sudo apt-get install -y libudev-dev pkg-config build-essential protobuf-compiler
42+
43+
- name: Setup Rust toolchain
44+
uses: actions-rust-lang/setup-rust-toolchain@v1
45+
with:
46+
cache-workspaces: .
47+
48+
- name: Run metrics contract test
49+
run: cargo test --test metrics_contract_test -p forester

.github/workflows/programs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
system-programs:
3636
name: ${{ matrix.test-group }}
3737
if: github.event.pull_request.draft == false
38-
runs-on: warp-ubuntu-latest-x64-4x
38+
runs-on: ubuntu-latest
3939
timeout-minutes: 90
4040

4141
services:

0 commit comments

Comments
 (0)