Skip to content
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

Jump to bottom

Added validation of the coin's fields during block production and validation #1506

Merged
merged 3 commits into from
Nov 22, 2023
Merged

Added validation of the coin's fields during block production and validation #1506

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
3144544
Added validation of the coin's fields during block production and val…
xgreenx Nov 21, 2023
d422fd9
Add test for the contract input
xgreenx Nov 21, 2023
e151254
Updated CHANGELOG.md
xgreenx Nov 21, 2023
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ Description of the upcoming release here.
- [#1454](https://github.com/FuelLabs/fuel-core/pull/1454): Update gas benchmarks for opcodes that append receipts.

#### Breaking
- [#1506](https://github.com/FuelLabs/fuel-core/pull/1506): Added validation of the coin's fields during block production and validation. Before, it was possible to submit a transaction that didn't match the coin's values in the database, allowing printing/using unavailable assets.
- [#1491](https://github.com/FuelLabs/fuel-core/pull/1491): Removed unused request and response variants from the Gossipsub implementation, as well as related definitions and tests. Specifically, this removes gossiping of `ConsensusVote` and `NewBlock` events.
- [#1472](https://github.com/FuelLabs/fuel-core/pull/1472): Upgraded `fuel-vm` to `v0.42.0`. It introduces transaction policies that changes layout of the transaction. FOr more information check the [v0.42.0](https://github.com/FuelLabs/fuel-vm/pull/635) release.
- [#1470](https://github.com/FuelLabs/fuel-core/pull/1470): Divide `DependentCost` into "light" and "heavy" operations.
Expand Down
255 changes: 187 additions & 68 deletions crates/fuel-core/src/executor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ use fuel_core_executor::{
use fuel_core_storage::{
tables::{
Coins,
ContractsInfo,
ContractsLatestUtxo,
FuelBlocks,
Messages,
Expand All @@ -26,6 +27,7 @@ use fuel_core_storage::{
StorageAsRef,
StorageInspect,
};
use fuel_core_txpool::types::ContractId;
#[allow(unused_imports)]
use fuel_core_types::{
blockchain::{
Expand Down Expand Up @@ -123,8 +125,6 @@ use fuel_core_types::{
txpool::TransactionStatus,
},
};

use fuel_core_txpool::types::ContractId;
use fuel_core_types::{
fuel_tx::{
field::{
Expand Down Expand Up @@ -1077,8 +1077,6 @@ where
match input {
Input::CoinSigned(CoinSigned { utxo_id, .. })
| Input::CoinPredicate(CoinPredicate { utxo_id, .. }) => {
// TODO: Check that fields are equal. We already do that check
// in the `fuel-core-txpool`, so we need to reuse the code here.
if let Some(coin) = db.storage::<Coins>().get(utxo_id)? {
let coin_mature_height = coin
.tx_pointer
Expand All @@ -1091,43 +1089,36 @@ where
)
.into())
}

if !coin
.matches_input(input)
.expect("The input is a coin above")
{
return Err(
TransactionValidityError::CoinMismatch(*utxo_id).into()
)
}
} else {
return Err(
TransactionValidityError::CoinDoesNotExist(*utxo_id).into()
)
}
}
Input::Contract(_) => {
// TODO: Check that contract exists
Input::Contract(contract) => {
if !db
.storage::<ContractsInfo>()
.contains_key(&contract.contract_id)?
{
return Err(TransactionValidityError::ContractDoesNotExist(
contract.contract_id,
)
.into())
}
}
Input::MessageCoinSigned(MessageCoinSigned {
sender,
recipient,
amount,
nonce,
..
})
| Input::MessageCoinPredicate(MessageCoinPredicate {
sender,
recipient,
amount,
nonce,
..
})
| Input::MessageDataSigned(MessageDataSigned {
sender,
recipient,
amount,
nonce,
..
})
| Input::MessageDataPredicate(MessageDataPredicate {
sender,
recipient,
amount,
nonce,
..
}) => {
Input::MessageCoinSigned(MessageCoinSigned { nonce, .. })
| Input::MessageCoinPredicate(MessageCoinPredicate { nonce, .. })
| Input::MessageDataSigned(MessageDataSigned { nonce, .. })
| Input::MessageDataPredicate(MessageDataPredicate { nonce, .. }) => {
// Eagerly return already spent if status is known.
if db.message_is_spent(nonce)? {
return Err(
Expand All @@ -1145,42 +1136,14 @@ where
)
.into())
}
if message.sender != *sender {
return Err(TransactionValidityError::MessageSenderMismatch(
*nonce,
)
.into())
}
if message.recipient != *recipient {

if !message
.matches_input(input)
.expect("The input is message above")
{
return Err(
TransactionValidityError::MessageRecipientMismatch(
*nonce,
)
.into(),
)
}
if message.amount != *amount {
return Err(TransactionValidityError::MessageAmountMismatch(
*nonce,
TransactionValidityError::MessageMismatch(*nonce).into()
)
.into())
}
if message.nonce != *nonce {
return Err(TransactionValidityError::MessageNonceMismatch(
*nonce,
)
.into())
}
let expected_data = if message.data.is_empty() {
None
} else {
Some(message.data.as_slice())
};
if expected_data != input.input_data() {
return Err(TransactionValidityError::MessageDataMismatch(
*nonce,
)
.into())
}
} else {
return Err(
Expand Down Expand Up @@ -3040,6 +3003,130 @@ mod tests {
.expect("coin should be unspent");
}

#[test]
fn coin_input_fails_when_mismatches_database() {
const AMOUNT: u64 = 100;

let tx = TxBuilder::new(2322u64)
.coin_input(AssetId::default(), AMOUNT)
.change_output(AssetId::default())
.build()
.transaction()
.clone();

let input = tx.inputs()[0].clone();
let db = &mut Database::default();

// Inserting a coin with `AMOUNT - 1` should cause a mismatching error during production.
db.storage::<Coins>()
.insert(
&input.utxo_id().unwrap().clone(),
&CompressedCoin {
owner: *input.input_owner().unwrap(),
amount: AMOUNT - 1,
asset_id: AssetId::default(),
maturity: Default::default(),
tx_pointer: Default::default(),
},
)
.unwrap();
let executor = Executor::test(
db.clone(),
Config {
utxo_validation_default: true,
..Default::default()
},
);

let block = PartialFuelBlock {
header: Default::default(),
transactions: vec![tx.into()],
};

let ExecutionResult {
skipped_transactions,
..
} = executor
.execute_and_commit(
ExecutionBlock::Production(block),
ExecutionOptions {
utxo_validation: true,
},
)
.unwrap();
// `tx` should be skipped.
assert_eq!(skipped_transactions.len(), 1);
let err = &skipped_transactions[0].1;
assert!(matches!(
err,
&ExecutorError::TransactionValidity(TransactionValidityError::CoinMismatch(
_
))
));
}

#[test]
fn contract_input_fails_when_doesnt_exist_in_database() {
let contract_id: ContractId = [1; 32].into();
let tx = TxBuilder::new(2322u64)
.contract_input(contract_id)
.coin_input(AssetId::default(), 100)
.change_output(AssetId::default())
.contract_output(&contract_id)
.build()
.transaction()
.clone();

let input = tx.inputs()[1].clone();
let db = &mut Database::default();

db.storage::<Coins>()
.insert(
&input.utxo_id().unwrap().clone(),
&CompressedCoin {
owner: *input.input_owner().unwrap(),
amount: 100,
asset_id: AssetId::default(),
maturity: Default::default(),
tx_pointer: Default::default(),
},
)
.unwrap();
let executor = Executor::test(
db.clone(),
Config {
utxo_validation_default: true,
..Default::default()
},
);

let block = PartialFuelBlock {
header: Default::default(),
transactions: vec![tx.into()],
};

let ExecutionResult {
skipped_transactions,
..
} = executor
.execute_and_commit(
ExecutionBlock::Production(block),
ExecutionOptions {
utxo_validation: true,
},
)
.unwrap();
// `tx` should be skipped.
assert_eq!(skipped_transactions.len(), 1);
let err = &skipped_transactions[0].1;
assert!(matches!(
err,
&ExecutorError::TransactionValidity(
TransactionValidityError::ContractDoesNotExist(_)
)
));
}

#[test]
fn skipped_txs_not_affect_order() {
// `tx1` is invalid because it doesn't have inputs for gas.
Expand Down Expand Up @@ -4196,6 +4283,38 @@ mod tests {
));
}

#[test]
fn message_input_fails_when_mismatches_database() {
let mut rng = StdRng::seed_from_u64(2322);

let (tx, mut message) = make_tx_and_message(&mut rng, 0);

// Modifying the message to make it mismatch
message.amount = 123;

let mut block = Block::default();
*block.transactions_mut() = vec![tx.clone()];

let ExecutionResult {
skipped_transactions,
..
} = make_executor(&[&message])
.execute_and_commit(
ExecutionBlock::Production(block.clone().into()),
ExecutionOptions {
utxo_validation: true,
},
)
.unwrap();
let err = &skipped_transactions[0].1;
assert!(matches!(
err,
&ExecutorError::TransactionValidity(
TransactionValidityError::MessageMismatch(_)
)
));
}

#[test]
fn message_fails_when_spending_already_spent_message_id() {
let mut rng = StdRng::seed_from_u64(2322);
Expand Down
Loading
Loading