Skip to content

solana: fix idl build #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 28, 2025
Merged

solana: fix idl build #16

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed70bb9
solana: fix idl build
a5-pickle Apr 28, 2025
c9377c2
solana: update Makefile
a5-pickle Apr 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/solana.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ jobs:
node-version: "20.11.0"
solana-cli-version: "1.18.15"
anchor-version: "0.30.1"
- name: Set default Rust toolchain
run: rustup default stable
working-directory: ./solana
# - name: Set default Rust toolchain
# run: rustup default stable
# working-directory: ./solana
- name: make check-idl
run: make check-idl
working-directory: ./solana
Expand All @@ -80,9 +80,9 @@ jobs:
node-version: "20.11.0"
solana-cli-version: "1.18.15"
anchor-version: "0.30.1"
- name: Set default Rust toolchain
run: rustup default stable
working-directory: ./solana
# - name: Set default Rust toolchain
# run: rustup default stable
# working-directory: ./solana
- name: make anchor-test
run: make anchor-test
working-directory: ./solana
Expand All @@ -101,9 +101,9 @@ jobs:
node-version: "20.11.0"
solana-cli-version: "1.18.15"
anchor-version: "0.30.1"
- name: Set default Rust toolchain
run: rustup default stable
working-directory: ./solana
# - name: Set default Rust toolchain
# run: rustup default stable
# working-directory: ./solana
- name: make anchor-test-upgrade
run: make anchor-test-upgrade
working-directory: ./solana
12 changes: 9 additions & 3 deletions solana/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,17 @@ endif

.PHONY: anchor-test-setup
anchor-test-setup: node_modules ts/tests/artifacts $(CLONED_MAINNET_PROGRAMS)
anchor build -- --features integration-test
anchor build --no-idl -- --features integration-test

.PHONY: idl
idl:
anchor build -- --features localnet
mkdir -p target/idl target/types
RUSTUP_TOOLCHAIN=nightly-2024-06-20 anchor idl build -p matching-engine -o target/idl/matching_engine.json
anchor idl type -o target/types/matching_engine.ts target/idl/matching_engine.json
RUSTUP_TOOLCHAIN=nightly-2024-06-20 anchor idl build -p token-router -o target/idl/token_router.json
anchor idl type -o target/types/token_router.ts target/idl/token_router.json
RUSTUP_TOOLCHAIN=nightly-2024-06-20 anchor idl build -p upgrade-manager -o target/idl/upgrade_manager.json
anchor idl type -o target/types/upgrade_manager.ts target/idl/upgrade_manager.json
mkdir -p ts/src/idl/json
mkdir -p ts/src/idl/ts
cp -r target/idl/* ts/src/idl/json/
Expand All @@ -65,7 +71,7 @@ anchor-test: anchor-test-setup

.PHONY: anchor-test-upgrade
anchor-test-upgrade: node_modules ts/tests/artifacts $(CLONED_MAINNET_PROGRAMS)
anchor build -- --features testnet
anchor build --no-idl -- --features testnet
cp target/deploy/matching_engine.so ts/tests/artifacts/new_testnet_matching_engine.so
cp target/deploy/token_router.so ts/tests/artifacts/new_testnet_token_router.so
cp target/deploy/upgrade_manager.so ts/tests/artifacts/testnet_upgrade_manager.so
Expand Down