Account-base fee collection

Cargo.toml

@@ -115,4 +115,4 @@ tempfile = "3.4"
 tikv-jemallocator = "0.5"
 
 [patch.crates-io]
-fuel-vm = { git = "https://github.com/FuelLabs/fuel-vm/", branch = "feature/mint-tx-rework-contract" }
+fuel-vm = { git = "https://github.com/FuelLabs/fuel-vm/", branch = "master" }

crates/client/src/client/schema/tx/transparent_tx.rs

@@ -82,7 +82,11 @@ pub struct Transaction {
     pub id: TransactionId,
     pub tx_pointer: Option<TxPointer>,
     pub input_asset_ids: Option<Vec<AssetId>>,
+    /// The list of all contracts from the inputs of the transaction.
+    ///
+    /// It is a helper function and doesn't have a corresponding field in the transaction.
     pub input_contracts: Option<Vec<ContractIdFragment>>,
+    /// The field of the `Mint` transaction.
     pub input_contract: Option<InputContract>,
     pub inputs: Option<Vec<Input>>,
     pub is_script: bool,

crates/fuel-core/src/executor.rs

@@ -593,7 +593,7 @@ where
             block.transactions.push(tx);
             execution_data.tx_count = tx_count
                 .checked_add(1)
-                .ok_or(ExecutorError::TooMuchTransactions)?;
+                .ok_or(ExecutorError::TooManyTransactions)?;
 
             Ok(())
         };
@@ -643,7 +643,7 @@ where
         }
 
         if execution_kind != ExecutionKind::DryRun && !data.found_mint {
-            return Err(ExecutorError::CoinbaseIsMissed)
+            return Err(ExecutorError::MintMissing)
         }
 
         Ok(data)
@@ -715,12 +715,12 @@ where
         options: ExecutionOptions,
     ) -> ExecutorResult<Transaction> {
         if execution_data.found_mint {
-            return Err(ExecutorError::CoinbaseSecondTransaction)
+            return Err(ExecutorError::MintFoundSecondEntry)
         }
         execution_data.found_mint = true;
 
         if checked_mint.transaction().tx_pointer().tx_index() != execution_data.tx_count {
-            return Err(ExecutorError::CoinbaseIsNotLastTransaction)
+            return Err(ExecutorError::MintIsNotLastTransaction)
         }
 
         let coinbase_id = checked_mint.id();
@@ -779,7 +779,7 @@ where
                 *mint.mint_amount(),
             )
             .map_err(|e| anyhow::anyhow!(e))
-            .map_err(ExecutorError::CoinbaseCantIncreaseBalance)?;
+            .map_err(ExecutorError::CoinbaseCannotIncreaseBalance)?;
             sub_block_db_commit.commit()?;
 
             self.persist_output_utxos(
@@ -817,7 +817,7 @@ where
 
             if execution_kind == ExecutionKind::Validation {
                 if mint.input_contract() != &input || mint.output_contract() != &output {
-                    return Err(ExecutorError::CoinbaseMismatch)
+                    return Err(ExecutorError::MintMismatch)
                 }
             } else {
                 *mint.input_contract_mut() = input;
@@ -830,7 +830,7 @@ where
             let input = input::contract::Contract::default();
             let output = output::contract::Contract::default();
             if mint.input_contract() != &input || mint.output_contract() != &output {
-                return Err(ExecutorError::CoinbaseMismatch)
+                return Err(ExecutorError::MintMismatch)
             }
         }
 
@@ -2407,7 +2407,7 @@ mod tests {
                 .expect_err("Expected error because coinbase if invalid");
             assert!(matches!(
                 validation_err,
-                ExecutorError::CoinbaseIsNotLastTransaction
+                ExecutorError::MintIsNotLastTransaction
             ));
         }
 
@@ -2419,7 +2419,7 @@ mod tests {
             let validation_err = validator
                 .execute_and_commit(ExecutionBlock::Validation(block), Default::default())
                 .expect_err("Expected error because coinbase is missing");
-            assert!(matches!(validation_err, ExecutorError::CoinbaseIsMissed));
+            assert!(matches!(validation_err, ExecutorError::MintMissing));
         }
 
         #[test]
@@ -2529,7 +2529,7 @@ mod tests {
                 .expect_err("Expected error because coinbase if invalid");
             assert!(matches!(
                 validation_err,
-                ExecutorError::CoinbaseSecondTransaction
+                ExecutorError::MintFoundSecondEntry
             ));
         }
     }

crates/fuel-core/src/schema/tx/types.rs

@@ -313,7 +313,9 @@ impl Transaction {
             fuel_tx::Transaction::Create(create) => {
                 Some(create.input_contracts().map(|v| Contract(*v)).collect())
             }
-            fuel_tx::Transaction::Mint(_) => None,
+            fuel_tx::Transaction::Mint(mint) => {
+                Some(vec![Contract(mint.input_contract().contract_id)])
+            }
         }
     }
 

crates/services/txpool/src/transaction_selector.rs

@@ -16,7 +16,7 @@ pub fn select_transactions(
     // Future improvements to this algorithm may take into account the parallel nature of
     // transactions to maximize throughput.
     let mut used_block_space: Word = 0;
-    // The maximum index for the transaction is `u16`, so we need to
+    // The type of the index for the transaction is `u16`, so we need to
     // limit it to `MAX` value minus 1(because of the `Mint` transaction).
     let takes_txs = u16::MAX - 1;
 

crates/types/src/services/executor.rs

@@ -247,22 +247,22 @@ impl ExecutionKind {
 pub enum Error {
     #[error("Transaction id was already used: {0:#x}")]
     TransactionIdCollision(Bytes32),
-    #[error("Too much transactions in the block")]
-    TooMuchTransactions,
+    #[error("Too many transactions in the block")]
+    TooManyTransactions,
     #[error("output already exists")]
     OutputAlreadyExists,
     #[error("The computed fee caused an integer overflow")]
     FeeOverflow,
-    #[error("The blocks is missing `Mint` transaction.")]
-    CoinbaseIsMissed,
-    #[error("The second entry of the `Mint` - coinbase transaction.")]
-    CoinbaseSecondTransaction,
-    #[error("The last transaction in the block is not `Mint` - coinbase.")]
-    CoinbaseIsNotLastTransaction,
-    #[error("Coinbase mismatches expectations.")]
-    CoinbaseMismatch,
+    #[error("The block is missing `Mint` transaction.")]
+    MintMissing,
+    #[error("Found the second entry of the `Mint` transaction in the block.")]
+    MintFoundSecondEntry,
+    #[error("The last transaction in the block is not `Mint`.")]
+    MintIsNotLastTransaction,
+    #[error("The `Mint` transaction mismatches expectations.")]
+    MintMismatch,
     #[error("Can't increase the balance of the coinbase contract: {0}.")]
-    CoinbaseCantIncreaseBalance(anyhow::Error),
+    CoinbaseCannotIncreaseBalance(anyhow::Error),
     #[error("Coinbase amount mismatches with expected.")]
     CoinbaseAmountMismatch,
     #[error("Invalid transaction: {0}")]

tests/tests/tx.rs

@@ -305,12 +305,12 @@ async fn get_transactions() {
         .iter()
         .map(|tx| tx.transaction.id(&ChainId::default()))
         .collect_vec();
-    // coinbase_tx1
     assert_eq!(transactions[0], tx1);
-    // coinbase_tx2
+    // coinbase_tx1
     assert_eq!(transactions[2], tx2);
-    // coinbase_tx3
+    // coinbase_tx2
     assert_eq!(transactions[4], tx3);
+    // coinbase_tx3
     // Check pagination state for first page
     assert!(response.has_next_page);
     assert!(!response.has_previous_page);