Skip to content

Minor p2p improvement and extra tests #2035

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
ImplOfAnImpl merged 3 commits into from
Apr 2, 2026
Merged

Minor p2p improvement and extra tests #2035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
632f4af
chainstate test suite: add new test `mint_pseudo_unlimited_supply_max…
ImplOfAnImpl Mar 27, 2026
89cbc53
P2p: call preliminary_headers_check earlier
ImplOfAnImpl Mar 30, 2026
790abdc
P2p: add test for peer extending an invalidated branch
ImplOfAnImpl Mar 30, 2026
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
287 changes: 253 additions & 34 deletions chainstate/test-suite/src/tests/fungible_tokens_v1.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1350,9 +1350,9 @@ fn mint_unlimited_supply(#[case] seed: Seed) {
});
}

// Issue and mint maximum possible tokens for Unlimited supply.
// Try to mint 1 more and check an error.
// Try to mint random number and check an error.
// Issue and mint maximum possible tokens (i128::MAX) for Unlimited supply.
// Try to mint 1 more and expect an error.
// Try to mint random number and expect an error.
#[rstest]
#[trace]
#[case(Seed::from_entropy())]
Expand All @@ -1373,8 +1373,8 @@ fn mint_unlimited_supply_max(#[case] seed: Seed) {
IsTokenFreezable::No,
);

// Mint tokens i128::MAX
let mint_tx = TransactionBuilder::new()
// Mint i128::MAX atoms
let initial_mint_tx = TransactionBuilder::new()
.add_input(
TxInput::from_command(
AccountNonce::new(0),
Expand All @@ -1395,9 +1395,9 @@ fn mint_unlimited_supply_max(#[case] seed: Seed) {
Destination::AnyoneCanSpend,
))
.build();
let mint_tx_id = mint_tx.transaction().get_id();
let initial_mint_tx_id = initial_mint_tx.transaction().get_id();
tf.make_block_builder()
.add_transaction(mint_tx)
.add_transaction(initial_mint_tx)
.build_and_process(&mut rng)
.unwrap();

Expand All @@ -1416,25 +1416,29 @@ fn mint_unlimited_supply_max(#[case] seed: Seed) {
true,
);

{
// Try mint one more over i128::MAX
let mint_tx = TransactionBuilder::new()
let make_mint_tx = |amount| {
TransactionBuilder::new()
.add_input(
TxInput::from_command(
AccountNonce::new(1),
AccountCommand::MintTokens(token_id, Amount::from_atoms(1)),
AccountCommand::MintTokens(token_id, amount),
),
InputWitness::NoSignature(None),
)
.add_input(
TxInput::from_utxo(mint_tx_id.into(), 0),
TxInput::from_utxo(initial_mint_tx_id.into(), 0),
InputWitness::NoSignature(None),
)
.add_output(TxOutput::Transfer(
OutputValue::TokenV1(token_id, Amount::from_atoms(1)),
OutputValue::TokenV1(token_id, amount),
Destination::AnyoneCanSpend,
))
.build();
.build()
};

{
// Try minting one more atom.
let mint_tx = make_mint_tx(Amount::from_atoms(1));
let mint_tx_id = mint_tx.transaction().get_id();
let result =
tf.make_block_builder().add_transaction(mint_tx).build_and_process(&mut rng);
Expand All @@ -1454,41 +1458,256 @@ fn mint_unlimited_supply_max(#[case] seed: Seed) {
);
}

// Try mint random number over i128::MAX
let random_amount = Amount::from_atoms(rng.gen_range(0..i128::MAX as u128));
let mint_tx = TransactionBuilder::new()
{
// Try minting a random number of atoms
let amount = Amount::from_atoms(rng.gen_range(1..=i128::MAX as u128));
let mint_tx = make_mint_tx(amount);
let mint_tx_id = mint_tx.transaction().get_id();
let result =
tf.make_block_builder().add_transaction(mint_tx).build_and_process(&mut rng);

assert_eq!(
result.unwrap_err(),
ChainstateError::ProcessBlockError(BlockError::StateUpdateFailed(
ConnectTransactionError::ConstrainedValueAccumulatorError(
constraints_value_accumulator::Error::TokensAccountingError(
tokens_accounting::Error::AccountingError(
accounting::Error::ArithmeticErrorDeltaAdditionFailed
)
),
mint_tx_id.into()
)
))
);
}

{
// For completeness, try minting a random number of atoms bigger than i128::MAX.
// A different error will be generated.
let amount = Amount::from_atoms(rng.gen_range((i128::MAX as u128) + 1..=u128::MAX));
let mint_tx = make_mint_tx(amount);
let mint_tx_id = mint_tx.transaction().get_id();
let result =
tf.make_block_builder().add_transaction(mint_tx).build_and_process(&mut rng);

assert_eq!(
result.unwrap_err(),
ChainstateError::ProcessBlockError(BlockError::StateUpdateFailed(
ConnectTransactionError::ConstrainedValueAccumulatorError(
constraints_value_accumulator::Error::TokensAccountingError(
tokens_accounting::Error::AccountingError(
accounting::Error::ArithmeticErrorToSignedFailed
)
),
mint_tx_id.into()
)
))
);
}
});
}

// Same as mint_unlimited_supply_max, but use TokenTotalSupply::Fixed with an amount bigger than i128::MAX.
// 1) mint maximum possible tokens (i128::MAX);
// 2) try minting 1 more and expect an error;
// 3) try minting a random amount and expect an error.
#[rstest]
#[trace]
#[case(Seed::from_entropy())]
fn mint_pseudo_unlimited_supply_max(#[case] seed: Seed) {
utils::concurrency::model(move || {
let mut rng = make_seedable_rng(seed);
let mut tf = TestFramework::builder(&mut rng).build();

let token_supply_change_fee =
tf.chainstate.get_chain_config().token_supply_change_fee(BlockHeight::zero());

let max_amount_to_mint = Amount::from_atoms(i128::MAX as u128);
let total_supply_atoms = if rng.gen_bool(0.5) {
u128::MAX
} else {
rng.gen_range((i128::MAX as u128) + 1..u128::MAX)
};
let total_supply_atoms_above_i128_max = total_supply_atoms - i128::MAX as u128;
assert!(total_supply_atoms_above_i128_max > 0);

let (token_id, issuance_block_id, issuance_tx, issuance, utxo_with_change) =
issue_token_from_genesis(
&mut rng,
&mut tf,
TokenTotalSupply::Fixed(Amount::from_atoms(total_supply_atoms)),
IsTokenFreezable::No,
);

// Mint i128::MAX atoms
let initial_mint_tx = TransactionBuilder::new()
.add_input(
TxInput::from_command(
AccountNonce::new(1),
AccountCommand::MintTokens(token_id, random_amount),
AccountNonce::new(0),
AccountCommand::MintTokens(token_id, max_amount_to_mint),
),
InputWitness::NoSignature(None),
)
.add_input(
TxInput::from_utxo(mint_tx_id.into(), 0),
utxo_with_change.clone().into(),
InputWitness::NoSignature(None),
)
.add_output(TxOutput::Transfer(
OutputValue::TokenV1(token_id, random_amount),
OutputValue::Coin(token_supply_change_fee),
Destination::AnyoneCanSpend,
))
.add_output(TxOutput::Transfer(
OutputValue::TokenV1(token_id, max_amount_to_mint),
Destination::AnyoneCanSpend,
))
.build();
let mint_tx_id = mint_tx.transaction().get_id();
let result = tf.make_block_builder().add_transaction(mint_tx).build_and_process(&mut rng);
let initial_mint_tx_id = initial_mint_tx.transaction().get_id();
tf.make_block_builder()
.add_transaction(initial_mint_tx)
.build_and_process(&mut rng)
.unwrap();

assert_eq!(
result.unwrap_err(),
ChainstateError::ProcessBlockError(BlockError::StateUpdateFailed(
ConnectTransactionError::ConstrainedValueAccumulatorError(
constraints_value_accumulator::Error::TokensAccountingError(
tokens_accounting::Error::AccountingError(
accounting::Error::ArithmeticErrorDeltaAdditionFailed
)
check_fungible_token(
&tf,
&mut rng,
&token_id,
&ExpectedFungibleTokenData {
issuance,
issuance_tx,
issuance_block_id,
circulating_supply: Some(max_amount_to_mint),
is_locked: false,
is_frozen: IsTokenFrozen::No(IsTokenFreezable::No),
},
true,
);

let make_mint_tx = |amount| {
TransactionBuilder::new()
.add_input(
TxInput::from_command(
AccountNonce::new(1),
AccountCommand::MintTokens(token_id, amount),
),
mint_tx_id.into()
InputWitness::NoSignature(None),
)
))
);
.add_input(
TxInput::from_utxo(initial_mint_tx_id.into(), 0),
InputWitness::NoSignature(None),
)
.add_output(TxOutput::Transfer(
OutputValue::TokenV1(token_id, amount),
Destination::AnyoneCanSpend,
))
.build()
};

{
// Try mint one more atom
let mint_tx = make_mint_tx(Amount::from_atoms(1));
let mint_tx_id = mint_tx.transaction().get_id();
let result =
tf.make_block_builder().add_transaction(mint_tx).build_and_process(&mut rng);

assert_eq!(
result.unwrap_err(),
ChainstateError::ProcessBlockError(BlockError::StateUpdateFailed(
ConnectTransactionError::ConstrainedValueAccumulatorError(
constraints_value_accumulator::Error::TokensAccountingError(
tokens_accounting::Error::AccountingError(
accounting::Error::ArithmeticErrorDeltaAdditionFailed
)
),
mint_tx_id.into()
)
))
);
}

{
// Try minting a random number of atoms, so that the total is below the specified max supply.
let amount = Amount::from_atoms(rng.gen_range(1..=total_supply_atoms_above_i128_max));
let mint_tx = make_mint_tx(amount);
let mint_tx_id = mint_tx.transaction().get_id();
let result =
tf.make_block_builder().add_transaction(mint_tx).build_and_process(&mut rng);

assert_eq!(
result.unwrap_err(),
ChainstateError::ProcessBlockError(BlockError::StateUpdateFailed(
ConnectTransactionError::ConstrainedValueAccumulatorError(
constraints_value_accumulator::Error::TokensAccountingError(
tokens_accounting::Error::AccountingError(
accounting::Error::ArithmeticErrorDeltaAdditionFailed
)
),
mint_tx_id.into()
)
))
);
}

{
// For completeness, try minting a random number of atoms, so that the total is above
// the specified max supply. Different errors are expected in this case, depending
// on whether the total amount fits into u128.

let max_extra_amount_to_fit_into_u128 = u128::MAX - total_supply_atoms;

if max_extra_amount_to_fit_into_u128 != 0 {
// The total amount fits into u128.

let amount = Amount::from_atoms(
total_supply_atoms_above_i128_max
+ rng.gen_range(1..=max_extra_amount_to_fit_into_u128),
);
let mint_tx = make_mint_tx(amount);
let mint_tx_id = mint_tx.transaction().get_id();
let result =
tf.make_block_builder().add_transaction(mint_tx).build_and_process(&mut rng);

assert_eq!(
result.unwrap_err(),
ChainstateError::ProcessBlockError(BlockError::StateUpdateFailed(
ConnectTransactionError::ConstrainedValueAccumulatorError(
constraints_value_accumulator::Error::TokensAccountingError(
tokens_accounting::Error::MintExceedsSupplyLimit(
amount,
Amount::from_atoms(total_supply_atoms),
token_id
)
),
mint_tx_id.into()
)
))
);
}

{
// The total amount doesn't fit into u128.

let amount = Amount::from_atoms(rng.gen_range(
total_supply_atoms_above_i128_max + max_extra_amount_to_fit_into_u128 + 1
..=u128::MAX,
));
let mint_tx = make_mint_tx(amount);
let mint_tx_id = mint_tx.transaction().get_id();
let result =
tf.make_block_builder().add_transaction(mint_tx).build_and_process(&mut rng);

assert_eq!(
result.unwrap_err(),
ChainstateError::ProcessBlockError(BlockError::StateUpdateFailed(
ConnectTransactionError::ConstrainedValueAccumulatorError(
constraints_value_accumulator::Error::TokensAccountingError(
tokens_accounting::Error::AmountOverflow
),
mint_tx_id.into()
)
))
);
}
}
});
}

Expand Down
18 changes: 9 additions & 9 deletions p2p/src/sync/peer/block_manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,6 +716,15 @@ where
self.incoming.peers_best_block_that_we_have.as_displayable()
);

// Now use preliminary_headers_check; this can be done because the first header
// is known to be connected to the chainstate.
{
let new_block_headers = new_block_headers.clone();
self.chainstate_handle
.call(move |c| Ok(c.preliminary_headers_check(&new_block_headers)?))
.await?;
}

if !self.incoming.requested_blocks.is_empty() {
// We are already downloading blocks, so bail out.
// Note that we unconditionally replace pending_headers with new_block_headers
Expand All @@ -732,15 +741,6 @@ where
return Ok(());
}

// Now use preliminary_headers_check; this can be done because the first header
// is known to be connected to the chainstate.
{
let new_block_headers = new_block_headers.clone();
self.chainstate_handle
.call(move |c| Ok(c.preliminary_headers_check(&new_block_headers)?))
.await?;
}

self.request_blocks(new_block_headers)
}

Expand Down
Loading
Loading