fix build

Anchor.toml

@@ -1,12 +1,14 @@
 [toolchain]
+anchor_version = "0.29.0"
+# solana_version = "1.16.9" # Solana version to use
 
 [features]
 seeds = false
 skip-lint = false
 
 [programs.devnet]
-# staking="67Ypf1ZfxRDvW3eKMcV1h6s9y7jfFyNJ5yWqMDDJ3Zvs"
-merkle_distributor="GVHsT5QaxEYjrSDt7bLGiQJ8xyzS2PD8byVVkcZUBsVR"
+staking="67Ypf1ZfxRDvW3eKMcV1h6s9y7jfFyNJ5yWqMDDJ3Zvs"
+# merkle_distributor="GVHsT5QaxEYjrSDt7bLGiQJ8xyzS2PD8byVVkcZUBsVR"
 # restaking = "8n3FHwYxFgQCQc2FNFkwDUf9mcqupxXcCvgfHbApMLv3"
 # restaking_v2 = "H69iS4rPnrRAMciLJcpEY3tRtFro7Mo7a2YAU8Q1busv"
 # solana_ibc = "2HLLVco5HvwWriNbUhmVwA2pCetRkpgrqwnjcsZdyTKT"
@@ -24,8 +26,8 @@ cluster = "Devnet"
 wallet = "/Users/mykyta/.config/solana/id.json"
 
 [workspace]
-members = ["solana/merkle-distributor"]
-# members = ["solana/staking/programs/staking", "solana/merkle-distributor"]
+# members = ["solana/merkle-distributor"]
+members = ["solana/staking/programs/staking"]
 
 [scripts]
 test = "./solana-test.sh"

solana/merkle-distributor/Cargo.toml

@@ -15,7 +15,7 @@ path = "src/lib.rs"
 [features]
 no-entrypoint = []
 cpi = ["no-entrypoint"]
-idl-build = ["anchor-lang/idl-build"]
+# idl-build = ["anchor-lang/idl-build"]
 
 [dependencies]
 anchor-lang = { workspace = true, features = ["init-if-needed"]}

solana/merkle-distributor/src/instructions/admin_new_claim.rs

@@ -50,7 +50,7 @@ impl PageAccount {
     pub const LEN: usize = 8 + std::mem::size_of::<PageAccount>() + PageVestingItem::LEN * 200;
 }
 
-#[derive(Clone, Debug, Default, PartialEq, Eq, borsh::BorshSerialize, borsh::BorshDeserialize)]
+#[account]
 pub struct PageVestingItem {
     pub claimant: Pubkey,
     pub amount_unlocked: u64,

solana/staking/programs/staking/Cargo.toml

@@ -16,15 +16,14 @@ no-idl = []
 no-log-ix-name = []
 cpi = ["no-entrypoint"]
 default = []
+idl-build = ["anchor-lang/idl-build", "anchor-spl/idl-build"]
 
 [dependencies]
 anchor-lang = { workspace = true, features = ["init-if-needed"] }
 anchor-spl = { workspace = true, features = ["metadata"] }
-solana-ibc = { workspace = true, features = ["cpi"] }
 merkle-distributor = { workspace = true, features = ["cpi"] }
 solana-program.workspace = true
 solana-signature-verifier.workspace = true
-pyth-solana-receiver-sdk.workspace = true
 
 [dev-dependencies]
 anchor-client.workspace = true

solana/staking/programs/staking/src/lib.rs

@@ -1608,7 +1608,7 @@ pub struct CommonStateStakingMode1 {
     pub new_admin_proposal: Option<Pubkey>,
 }
 
-#[derive(Clone, Debug, Default, PartialEq, Eq, borsh::BorshSerialize, borsh::BorshDeserialize)]
+#[account]
 pub struct EpochState {
     pub epoch_number: u64,
     pub total_stake_amount: u64,
@@ -1673,7 +1673,7 @@ impl LSTStakeState {
 }
 
 
-#[derive(Clone, Debug, Default, PartialEq, Eq, borsh::BorshSerialize, borsh::BorshDeserialize)]
+#[account]
 pub struct StakerState {
     pub timestamp: i64,
     pub amount: u64,