Check empty provides tags when decoding

smol-dot · Dec 27, 2023 · 8fd0c63 · 8fd0c63
1 parent eeef70a
commit 8fd0c63
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 18 deletions.
diff --git a/lib/src/transactions/validate.rs b/lib/src/transactions/validate.rs
@@ -256,7 +256,8 @@ fn valid_transaction(bytes: &[u8]) -> nom::IResult<&[u8], ValidTransaction> {
             nom::sequence::tuple((
                 nom::number::streaming::le_u64,
                 tags,
-                tags,
+                // TODO: maybe show by strong typing the fact that the provide tags are never empty
+                nom::combinator::verify(tags, |provides: &Vec<Vec<u8>>| !provides.is_empty()),
                 nom::combinator::map_opt(nom::number::streaming::le_u64, NonZeroU64::new),
                 util::nom_bool_decode,
             )),

diff --git a/light-base/src/transactions_service.rs b/light-base/src/transactions_service.rs
@@ -364,10 +364,6 @@ pub enum ValidateTransactionError {
     WasmExecution(runtime_host::ErrorDetail),
     /// Error while decoding the output of the runtime.
     OutputDecodeError(validate::DecodeError),
-    /// The list of provided tags ([`ValidTransaction::provides`]) is empty. It is mandatory for
-    /// the runtime to always provide a non-empty list of tags. This error is consequently a bug
-    /// in the runtime.
-    EmptyProvidedTags,
     /// Runtime called a forbidden host function.
     ForbiddenHostCall,
 }
@@ -1360,6 +1356,7 @@ async fn validate_transaction<TPlat: PlatformRef>(
         }
     };
 
+    // TODO: move somewhere else?
     log::debug!(
         target: log_target,
         "TxValidations <= Start(tx={}, block={}, block_height={})",
@@ -1378,7 +1375,6 @@ async fn validate_transaction<TPlat: PlatformRef>(
     let (runtime_call_lock, runtime) = runtime_lock
         .start(
             validate::VALIDATION_FUNCTION_NAME,
-            // TODO: don't hardcode v3 but determine parameters dynamically from the runtime
             validate::validate_transaction_runtime_parameters_v3(
                 iter::once(scale_encoded_transaction.as_ref()),
                 source,
@@ -1434,18 +1430,7 @@ async fn validate_transaction<TPlat: PlatformRef>(
                 );
                 runtime_call_lock.unlock(success.virtual_machine.into_prototype());
                 return match decode_result {
-                    Ok(Ok(decoded)) => {
-                        if decoded.provides.is_empty() {
-                            // TODO: this check should be performed by the validate module
-                            return Err(ValidationError::InvalidOrError(
-                                InvalidOrError::ValidateError(
-                                    ValidateTransactionError::EmptyProvidedTags,
-                                ),
-                            ));
-                        }
-
-                        Ok(decoded)
-                    }
+                    Ok(Ok(decoded)) => Ok(decoded),
                     Ok(Err(err)) => Err(ValidationError::InvalidOrError(InvalidOrError::Invalid(
                         err,
                     ))),