Skip to content

Commit 894f472

Browse files
ananas-blockananas-block
committed
chore: fix nits
1 parent 0656cb8 commit 894f472

7 files changed

Lines changed: 17 additions & 15 deletions

File tree

‎programs/registry/src/errors.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,5 @@ pub enum RegistryError {
3131
#[msg("Insufficient funds in pool")]
3232
InsufficientFunds,
3333
ProgramOwnerDefined,
34+
ProgramOwnerUndefined,
3435
}

‎programs/registry/src/lib.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -292,21 +292,21 @@ pub mod light_registry {
292292
queue_config: AddressQueueConfig,
293293
) -> Result<()> {
294294
// Address V1 trees are deprecated.
295-
// Creation of forested address V1 trees is disabled.
296-
// New address V1 trees must be program owned.
297-
// New address V1 trees must not have fees.
295+
// Light foresters (fee-based) are disabled for address V1 trees.
296+
// New address V1 trees must be program owned with a designated forester.
297+
// New address V1 trees must not have network fees.
298298
if program_owner.is_none() {
299299
msg!("Program owner must be defined.");
300-
return err!(RegistryError::ForesterUndefined);
300+
return err!(RegistryError::ProgramOwnerUndefined);
301301
}
302302
if merkle_tree_config.network_fee.is_some() {
303303
msg!("Network fee must be None.");
304304
return err!(RegistryError::InvalidNetworkFee);
305305
}
306-
// Only trees with a network fee will be serviced by light foresters.
306+
// A designated program-owned forester is required for address V1 trees.
307+
// Light foresters (fee-based) will not service address V1 trees.
307308
if forester.is_none() {
308-
msg!("Forester pubkey required for trees without a network fee.");
309-
msg!("Trees without a network fee will not be serviced by light foresters.");
309+
msg!("Forester pubkey required for program-owned trees.");
310310
return err!(RegistryError::ForesterUndefined);
311311
}
312312
// Unused parameter

‎programs/system/src/errors.rs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,8 @@ pub enum SystemProgramError {
140140
PackedAccountIndexOutOfBounds,
141141
#[error("Unimplemented.")]
142142
Unimplemented,
143+
#[error("Missing legacy Merkle tree context")]
144+
MissingLegacyMerkleContext,
143145
#[error("Batched Merkle tree error {0}")]
144146
BatchedMerkleTreeError(#[from] BatchedMerkleTreeError),
145147
#[error("Concurrent Merkle tree error {0}")]
@@ -223,6 +225,7 @@ impl From<SystemProgramError> for u32 {
223225
SystemProgramError::Unimplemented => 6063,
224226
SystemProgramError::CpiContextDeactivated => 6064,
225227
SystemProgramError::InputMerkleTreeIndexOutOfBounds => 6065,
228+
SystemProgramError::MissingLegacyMerkleContext => 6066,
226229
SystemProgramError::BatchedMerkleTreeError(e) => e.into(),
227230
SystemProgramError::IndexedMerkleTreeError(e) => e.into(),
228231
SystemProgramError::ConcurrentMerkleTreeError(e) => e.into(),

‎programs/system/src/processor/create_address_cpi_data.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ pub fn derive_new_addresses<'info, 'a, 'b: 'a, const ADDRESS_ASSIGNMENT: bool>(
4444
.get_legacy_merkle_context(
4545
new_address_params.address_merkle_tree_account_index(),
4646
)
47-
.unwrap()
47+
.ok_or(SystemProgramError::MissingLegacyMerkleContext)?
4848
.network_fee;
4949
if network_fee != 0 {
5050
network_fee += 5000;
@@ -56,7 +56,7 @@ pub fn derive_new_addresses<'info, 'a, 'b: 'a, const ADDRESS_ASSIGNMENT: bool>(
5656
.map_err(ProgramError::from)?,
5757
context
5858
.get_legacy_merkle_context(new_address_params.address_queue_index())
59-
.unwrap()
59+
.ok_or(SystemProgramError::MissingLegacyMerkleContext)?
6060
.rollover_fee,
6161
)
6262
}

‎programs/system/src/processor/create_inputs_cpi_data.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,9 @@ pub fn create_inputs_cpi_data<'a, 'info, T: InstructionData<'a>>(
7676
}
7777
AcpAccount::StateTree(_) => {
7878
is_batched = false;
79-
let legacy_context =
80-
context.get_legacy_merkle_context(current_mt_index).unwrap();
79+
let legacy_context = context
80+
.get_legacy_merkle_context(current_mt_index)
81+
.ok_or(SystemProgramError::MissingLegacyMerkleContext)?;
8182
let network_fee = legacy_context.network_fee;
8283
let hashed_pubkey = legacy_context.hashed_pubkey;
8384
context.set_network_fee_v1(network_fee, current_mt_index)?;

‎programs/system/src/processor/create_outputs_cpi_data.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ pub fn create_outputs_cpi_data<'a, 'info, T: InstructionData<'a>>(
100100
};
101101
let merkle_context = context
102102
.get_legacy_merkle_context(current_index as u8)
103-
.unwrap();
103+
.ok_or(SystemProgramError::MissingLegacyMerkleContext)?;
104104
hashed_merkle_tree = merkle_context.hashed_pubkey;
105105
rollover_fee = merkle_context.rollover_fee;
106106
mt_next_index = tree.next_index() as u32;

‎sdk-libs/client/src/fee.rs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ pub struct FeeConfig {
1212
// pub address_tree_configs: Vec<AddressMerkleTreeConfig>,
1313
pub network_fee: u64,
1414
pub address_network_fee: u64,
15-
pub batch_address_network_fee: u64,
1615
pub solana_network_fee: i64,
1716
}
1817

@@ -27,7 +26,6 @@ impl Default for FeeConfig {
2726
// address_tree_configs: vec![AddressMerkleTreeConfig::default()],
2827
network_fee: 5000,
2928
address_network_fee: 10000,
30-
batch_address_network_fee: 10_000,
3129
solana_network_fee: 5000,
3230
}
3331
}
@@ -41,7 +39,6 @@ impl FeeConfig {
4139
address_queue_rollover: 392, // not batched
4240
network_fee: 5000,
4341
address_network_fee: 10000,
44-
batch_address_network_fee: 10_000,
4542
solana_network_fee: 5000,
4643
}
4744
}

0 commit comments

Comments
 (0)