Skip to content

Commit 036e148

Browse files
committed
Add testnet program ID support for tip-distribution
1 parent 90d0d44 commit 036e148

4 files changed

Lines changed: 25 additions & 11 deletions

File tree

.github/workflows/build.yaml

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ jobs:
9393
- name: Install yarn dependencies
9494
working-directory: ./mev-programs
9595
run: yarn
96-
# Build
96+
# Build (using mainnet feature since localnet uses mainnet program IDs)
9797
- name: Build jito_tip_distribution
9898
working-directory: ./mev-programs
99-
run: RUSTUP_TOOLCHAIN=nightly-2025-04-16 anchor build --idl idl --program-name jito_tip_distribution
99+
run: RUSTUP_TOOLCHAIN=nightly-2025-04-16 anchor build --idl idl --program-name jito_tip_distribution -- --features jito-tip-distribution/mainnet
100100
- name: Build jito_tip_payment
101101
working-directory: ./mev-programs
102102
run: RUSTUP_TOOLCHAIN=nightly-2025-04-16 anchor build --idl idl --program-name jito_tip_payment
@@ -116,7 +116,7 @@ jobs:
116116
- run: solana-keygen new --no-bip39-passphrase # needed for tests
117117
- name: Run Anchor test
118118
working-directory: ./mev-programs
119-
run: RUSTUP_TOOLCHAIN=nightly-2025-04-16 anchor test
119+
run: RUSTUP_TOOLCHAIN=nightly-2025-04-16 anchor test --skip-build
120120

121121
verified_build:
122122
name: verified_build
@@ -138,34 +138,41 @@ jobs:
138138
- name: Verifiable Build
139139
working-directory: ./mev-programs
140140
run: |
141-
solana-verify build --library-name jito_tip_distribution --base-image solanafoundation/solana-verifiable-build:2.2.13
141+
# Build mainnet versions (with mainnet feature for tip-distribution)
142+
solana-verify build --library-name jito_tip_distribution --base-image solanafoundation/solana-verifiable-build:2.2.13 -- --features jito-tip-distribution/mainnet
143+
mv target/deploy/jito_tip_distribution.so target/deploy/jito_tip_distribution-mainnet.so
142144
solana-verify build --library-name jito_tip_payment --base-image solanafoundation/solana-verifiable-build:2.2.13
143145
solana-verify build --library-name jito_priority_fee_distribution --base-image solanafoundation/solana-verifiable-build:2.2.13
146+
# Build testnet version (without mainnet feature - uses testnet program ID)
147+
solana-verify build --library-name jito_tip_distribution --base-image solanafoundation/solana-verifiable-build:2.2.13
148+
mv target/deploy/jito_tip_distribution.so target/deploy/jito_tip_distribution-testnet.so
144149
145-
146-
- name: Upload Artifact
150+
- name: Upload Artifacts
147151
uses: actions/upload-artifact@v4
148152
with:
149153
name: build
150154
path: |
151-
mev-programs/target/deploy/jito_tip_distribution.so
155+
mev-programs/target/deploy/jito_tip_distribution-mainnet.so
156+
mev-programs/target/deploy/jito_tip_distribution-testnet.so
152157
mev-programs/target/deploy/jito_tip_payment.so
153158
mev-programs/target/deploy/jito_priority_fee_distribution.so
154159
mev-programs/programs/tip-distribution/idl/jito_tip_distribution.json
155160
mev-programs/programs/tip-payment/idl/jito_tip_payment.json
156161
mev-programs/programs/priority-fee-distribution/idl/jito_priority_fee_distribution.json
162+
157163
- name: Cleanup rust cache un-cacheable files
158164
run: |
159-
sudo rm ./mev-programs/target/deploy/jito_tip_distribution-keypair.json
160-
sudo rm ./mev-programs/target/deploy/jito_tip_payment-keypair.json
165+
sudo rm -f ./mev-programs/target/deploy/jito_tip_distribution-keypair.json
166+
sudo rm -f ./mev-programs/target/deploy/jito_tip_payment-keypair.json
161167
162168
# Tag related steps
163169
- name: Release
164170
uses: softprops/action-gh-release@v1
165171
if: startsWith(github.ref, 'refs/tags/')
166172
with:
167173
files: |
168-
mev-programs/target/deploy/jito_tip_distribution.so
174+
mev-programs/target/deploy/jito_tip_distribution-mainnet.so
175+
mev-programs/target/deploy/jito_tip_distribution-testnet.so
169176
mev-programs/target/deploy/jito_tip_payment.so
170177
mev-programs/target/deploy/jito_priority_fee_distribution.so
171178
mev-programs/target/idl/jito_tip_distribution.json

mev-programs/Anchor.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jito_tip_distribution = "4R3gSG8BpU4t19KYj8CfnbtRpnT8gtk4dvTHxVRwc2r7"
77
jito_tip_payment = "T1pyyaTNZsKv2WcRAB8oVnk93mLJw2XzjtVYqCsaHqt"
88

99
[programs.testnet]
10-
jito_tip_distribution = "F2Zu7QZiTYUhPd7u9ukRVwxh7B71oA3NMJcHuCHc29P2"
10+
jito_tip_distribution = "DzvGET57TAgEDxvm3ERUM4GNcsAJdqjDLCne9sdfY4wf"
1111
jito_tip_payment = "DCN82qDxJAQuSqHhv2BJuAgi41SPeKZB5ioBCTMNDrCC"
1212

1313
[programs.localnet]

mev-programs/programs/tip-distribution/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ custom-panic = []
2222
default = []
2323
idl-build = ["anchor-lang/idl-build"]
2424
anchor-debug = ["anchor-lang/anchor-debug"]
25+
# Build for mainnet program ID (4R3gSG8BpU4t19KYj8CfnbtRpnT8gtk4dvTHxVRwc2r7)
26+
# Without this feature, builds use testnet program ID (DzvGET57TAgEDxvm3ERUM4GNcsAJdqjDLCne9sdfY4wf)
27+
mainnet = []
2528

2629
[dependencies]
2730
anchor-lang = { workspace = true }

mev-programs/programs/tip-distribution/src/lib.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,12 @@ security_txt! {
2424
pub mod merkle_proof;
2525
pub mod state;
2626

27+
#[cfg(feature = "mainnet")]
2728
declare_id!("4R3gSG8BpU4t19KYj8CfnbtRpnT8gtk4dvTHxVRwc2r7");
2829

30+
#[cfg(not(feature = "mainnet"))]
31+
declare_id!("DzvGET57TAgEDxvm3ERUM4GNcsAJdqjDLCne9sdfY4wf");
32+
2933
#[program]
3034
pub mod jito_tip_distribution {
3135
use anchor_lang::solana_program;

0 commit comments

Comments
 (0)