From 26ae5cd224e5c94fca8ab55e78dab10c0e1928cb Mon Sep 17 00:00:00 2001 From: Evan Batsell Date: Tue, 17 Sep 2024 11:22:23 -0400 Subject: [PATCH] No idl-build in default target --- .github/workflows/build.yaml | 2 +- programs/steward/Cargo.toml | 2 +- programs/steward/src/events.rs | 2 ++ programs/steward/src/instructions/rebalance.rs | 1 - programs/steward/src/instructions/set_new_authority.rs | 3 +++ programs/steward/src/lib.rs | 1 + programs/steward/src/score.rs | 5 +++-- programs/steward/src/state/parameters.rs | 6 +++--- programs/steward/src/state/steward_state.rs | 7 ++++++- programs/steward/src/utils.rs | 5 ++++- programs/validator-history/Cargo.toml | 2 +- 11 files changed, 25 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 166f5fd9..dbc46776 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -124,7 +124,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: jito_steward.json - path: programs/steward/idl/jito_steward.json + path: programs/steward/idl/steward.json # tests run on verified build test: diff --git a/programs/steward/Cargo.toml b/programs/steward/Cargo.toml index 6032572c..b1ef0521 100644 --- a/programs/steward/Cargo.toml +++ b/programs/steward/Cargo.toml @@ -22,7 +22,7 @@ custom-heap = [] idl-build = ["anchor-lang/idl-build", "no-entrypoint"] [dependencies] -anchor-lang = { features = ["idl-build"], version = "0.30.0" } +anchor-lang = "0.30.0" bincode = "1.3.3" blake3 = "1.3.1" borsh = "0.10.0" diff --git a/programs/steward/src/events.rs b/programs/steward/src/events.rs index df5af673..1799e276 100644 --- a/programs/steward/src/events.rs +++ b/programs/steward/src/events.rs @@ -1,3 +1,4 @@ +#[cfg(feature = "idl-build")] use anchor_lang::idl::{ types::{IdlEnumVariant, IdlTypeDef, IdlTypeDefTy}, IdlBuild, @@ -70,6 +71,7 @@ pub enum RebalanceTypeTag { Decrease, } +#[cfg(feature = "idl-build")] impl IdlBuild for RebalanceTypeTag { fn create_type() -> Option { Some(IdlTypeDef { diff --git a/programs/steward/src/instructions/rebalance.rs b/programs/steward/src/instructions/rebalance.rs index b2157806..3de40b28 100644 --- a/programs/steward/src/instructions/rebalance.rs +++ b/programs/steward/src/instructions/rebalance.rs @@ -1,7 +1,6 @@ use std::num::NonZeroU32; use anchor_lang::{ - idl::*, prelude::*, solana_program::{ program::invoke_signed, diff --git a/programs/steward/src/instructions/set_new_authority.rs b/programs/steward/src/instructions/set_new_authority.rs index 0e82fbbe..5d6127bd 100644 --- a/programs/steward/src/instructions/set_new_authority.rs +++ b/programs/steward/src/instructions/set_new_authority.rs @@ -1,5 +1,7 @@ +#[cfg(feature = "idl-build")] use anchor_lang::idl::types::*; use anchor_lang::prelude::*; +#[cfg(feature = "idl-build")] use anchor_lang::IdlBuild; use borsh::{BorshDeserialize, BorshSerialize}; @@ -20,6 +22,7 @@ impl AuthorityType { } // Implement IdlBuild for AuthorityType +#[cfg(feature = "idl-build")] impl IdlBuild for AuthorityType { fn create_type() -> Option { Some(IdlTypeDef { diff --git a/programs/steward/src/lib.rs b/programs/steward/src/lib.rs index 37327e53..cd4ac649 100644 --- a/programs/steward/src/lib.rs +++ b/programs/steward/src/lib.rs @@ -1,5 +1,6 @@ #![allow(clippy::redundant_pub_crate)] use anchor_lang::prelude::*; +#[cfg(feature = "idl-build")] use anchor_lang::IdlBuild; use instructions::*; diff --git a/programs/steward/src/score.rs b/programs/steward/src/score.rs index c8ca986c..e38561fd 100644 --- a/programs/steward/src/score.rs +++ b/programs/steward/src/score.rs @@ -1,6 +1,7 @@ +#[cfg(feature = "idl-build")] +use anchor_lang::IdlBuild; use anchor_lang::{ - prelude::event, solana_program::pubkey::Pubkey, AnchorDeserialize, AnchorSerialize, IdlBuild, - Result, + prelude::event, solana_program::pubkey::Pubkey, AnchorDeserialize, AnchorSerialize, Result, }; use validator_history::{ClusterHistory, ValidatorHistory}; diff --git a/programs/steward/src/state/parameters.rs b/programs/steward/src/state/parameters.rs index 0c74d515..f695430a 100644 --- a/programs/steward/src/state/parameters.rs +++ b/programs/steward/src/state/parameters.rs @@ -1,5 +1,5 @@ -use anchor_lang::idl::types::*; -use anchor_lang::idl::*; +#[cfg(feature = "idl-build")] +use anchor_lang::idl::{types::*, *}; use anchor_lang::{prelude::Result, zero_copy}; use borsh::{BorshDeserialize, BorshSerialize}; use validator_history::utils::cast_epoch; @@ -37,7 +37,7 @@ pub struct UpdateParametersArgs { pub minimum_voting_epochs: Option, } -// #[cfg(feature = "idl-build")] +#[cfg(feature = "idl-build")] impl IdlBuild for UpdateParametersArgs { fn create_type() -> Option { Some(IdlTypeDef { diff --git a/programs/steward/src/state/steward_state.rs b/programs/steward/src/state/steward_state.rs index 88da95f7..c1b0e146 100644 --- a/programs/steward/src/state/steward_state.rs +++ b/programs/steward/src/state/steward_state.rs @@ -15,8 +15,12 @@ use crate::{ utils::{epoch_progress, get_target_lamports, stake_lamports_at_validator_list_index}, Config, Parameters, }; + +#[cfg(feature = "idl-build")] use anchor_lang::idl::types::*; -use anchor_lang::{prelude::*, IdlBuild}; +use anchor_lang::prelude::*; +#[cfg(feature = "idl-build")] +use anchor_lang::IdlBuild; use bytemuck::{Pod, Zeroable}; use spl_stake_pool::big_vec::BigVec; @@ -192,6 +196,7 @@ impl Display for StewardStateEnum { } } +#[cfg(feature = "idl-build")] impl IdlBuild for StewardStateEnum { fn create_type() -> Option { Some(IdlTypeDef { diff --git a/programs/steward/src/utils.rs b/programs/steward/src/utils.rs index 1539e99a..c39345c3 100644 --- a/programs/steward/src/utils.rs +++ b/programs/steward/src/utils.rs @@ -1,6 +1,8 @@ use std::ops::{Deref, Not}; -use anchor_lang::{idl::types::*, prelude::*}; +#[cfg(feature = "idl-build")] +use anchor_lang::idl::types::*; +use anchor_lang::prelude::*; use borsh::{BorshDeserialize, BorshSerialize}; use spl_pod::{bytemuck::pod_from_bytes, primitives::PodU64, solana_program::program_pack::Pack}; use spl_stake_pool::{ @@ -394,6 +396,7 @@ impl From for PreferredVali } } +#[cfg(feature = "idl-build")] impl IdlBuild for PreferredValidatorType { fn create_type() -> Option { Some(IdlTypeDef { diff --git a/programs/validator-history/Cargo.toml b/programs/validator-history/Cargo.toml index 377f3cbb..cd6b7bfe 100644 --- a/programs/validator-history/Cargo.toml +++ b/programs/validator-history/Cargo.toml @@ -25,7 +25,7 @@ custom-heap = [] idl-build = ["anchor-lang/idl-build", "no-entrypoint"] [dependencies] -anchor-lang = { features = ["idl-build"], version = "0.30.0" } +anchor-lang = "0.30.0" bincode = "1.3.3" bytemuck = { version = "1.13.1", features = ["derive", "min_const_generics"] } cfg-if = "1.0.0"