Merge casper-network#4988

4988: casper-networkGH-4985: Transaction vm2 settings r=mpapierski a=mpapierski Transaction settings valid only for VM2 are stored in an enum. This solves situation when transaction target has specified extra values that will not be used by VM1 runtime. Closes casper-network#4985 Co-authored-by: Michał Papierski <[email protected]> Co-authored-by: Ed Hastings <[email protected]> Co-authored-by: Michał Papierski <[email protected]>
teonite · Dec 10, 2024 · 73b3205 · 73b3205
2 parents a4a2dec + 874e518
commit 73b3205
Show file tree

Hide file tree

Showing 31 changed files with 510 additions and 551 deletions.
diff --git a/Makefile b/Makefile
@@ -152,7 +152,7 @@ lint-smart-contracts:
 
 .PHONY: audit-rs
 audit-rs:
-	$(CARGO) audit --ignore RUSTSEC-2024-0344 --ignore RUSTSEC-2024-0367 --ignore RUSTSEC-2024-0371
+	$(CARGO) audit --ignore RUSTSEC-2024-0344 --ignore RUSTSEC-2024-0367 --ignore RUSTSEC-2024-0371 --ignore RUSTSEC-2024-0421
 
 .PHONY: audit-as
 audit-as:

diff --git a/execution_engine/src/execution/error.rs b/execution_engine/src/execution/error.rs
@@ -9,7 +9,7 @@ use casper_types::{
     bytesrepr,
     execution::TransformError,
     system, AccessRights, AddressableEntityHash, ApiError, ByteCodeHash, CLType, CLValueError,
-    EntityVersionKey, Key, PackageHash, StoredValueTypeMismatch, TransactionRuntime, URef,
+    ContractRuntimeTag, EntityVersionKey, Key, PackageHash, StoredValueTypeMismatch, URef,
 };
 use casper_wasm::elements;
 
@@ -191,7 +191,7 @@ pub enum Error {
     InvalidUtf8Encoding(Utf8Error),
     /// Incompatible transaction runtime.
     #[error("Incompatible runtime: {0}")]
-    IncompatibleRuntime(TransactionRuntime),
+    IncompatibleRuntime(ContractRuntimeTag),
 }
 
 impl From<PreprocessingError> for Error {

diff --git a/execution_engine/src/runtime/mod.rs b/execution_engine/src/runtime/mod.rs
@@ -38,9 +38,9 @@ use casper_types::{
     },
     addressable_entity::{
         self, ActionThresholds, ActionType, AddressableEntity, AddressableEntityHash,
-        AssociatedKeys, EntityKindTag, EntryPoint, EntryPointAccess, EntryPointType, EntryPoints,
-        MessageTopicError, MessageTopics, NamedKeyAddr, NamedKeyValue, Parameter, Weight,
-        DEFAULT_ENTRY_POINT_NAME,
+        AssociatedKeys, ContractRuntimeTag, EntityKindTag, EntryPoint, EntryPointAccess,
+        EntryPointType, EntryPoints, MessageTopicError, MessageTopics, NamedKeyAddr, NamedKeyValue,
+        Parameter, Weight, DEFAULT_ENTRY_POINT_NAME,
     },
     bytesrepr::{self, Bytes, FromBytes, ToBytes},
     contract_messages::{
@@ -60,9 +60,8 @@ use casper_types::{
     ByteCodeKind, CLTyped, CLValue, ContextAccessRights, Contract, ContractWasm, EntityAddr,
     EntityKind, EntityVersion, EntityVersionKey, EntityVersions, Gas, GrantedAccess, Group, Groups,
     HashAddr, HostFunction, HostFunctionCost, InitiatorAddr, Key, NamedArg, Package, PackageHash,
-    PackageStatus, Phase, PublicKey, RuntimeArgs, RuntimeFootprint, StoredValue,
-    TransactionRuntime, Transfer, TransferResult, TransferV2, TransferredTo, URef,
-    DICTIONARY_ITEM_KEY_MAX_LENGTH, U512,
+    PackageStatus, Phase, PublicKey, RuntimeArgs, RuntimeFootprint, StoredValue, Transfer,
+    TransferResult, TransferV2, TransferredTo, URef, DICTIONARY_ITEM_KEY_MAX_LENGTH, U512,
 };
 
 use crate::{
@@ -1893,14 +1892,14 @@ where
                 EntityKind::System(_) | EntityKind::Account(_) => {
                     Key::ByteCode(ByteCodeAddr::Empty)
                 }
-                EntityKind::SmartContract(TransactionRuntime::VmCasperV1) => {
+                EntityKind::SmartContract(ContractRuntimeTag::VmCasperV1) => {
                     if self.context.engine_config().enable_entity {
                         Key::ByteCode(ByteCodeAddr::new_wasm_addr(byte_code_addr))
                     } else {
                         Key::Hash(byte_code_addr)
                     }
                 }
-                EntityKind::SmartContract(runtime @ TransactionRuntime::VmCasperV2) => {
+                EntityKind::SmartContract(runtime @ ContractRuntimeTag::VmCasperV2) => {
                     return Err(ExecError::IncompatibleRuntime(runtime));
                 }
             };
@@ -2576,7 +2575,7 @@ where
             main_purse,
             associated_keys,
             action_thresholds,
-            EntityKind::SmartContract(TransactionRuntime::VmCasperV1),
+            EntityKind::SmartContract(ContractRuntimeTag::VmCasperV1),
         );
         let entity_key = Key::AddressableEntity(entity_addr);
         self.context.metered_write_gs_unsafe(entity_key, entity)?;

diff --git a/execution_engine_testing/tests/src/test/contract_api/add_contract_version.rs b/execution_engine_testing/tests/src/test/contract_api/add_contract_version.rs
@@ -13,7 +13,7 @@ use casper_types::{
     bytesrepr::{Bytes, ToBytes},
     ApiError, BlockTime, Digest, EraId, InitiatorAddr, Key, PricingMode, ProtocolVersion,
     PublicKey, RuntimeArgs, SecretKey, TimeDiff, Timestamp, Transaction, TransactionArgs,
-    TransactionEntryPoint, TransactionRuntime, TransactionScheduling, TransactionTarget,
+    TransactionEntryPoint, TransactionRuntimeParams, TransactionScheduling, TransactionTarget,
     TransactionV1, TransactionV1Payload,
 };
 
@@ -49,8 +49,7 @@ fn try_add_contract_version(
     let txn = new_transaction_v1_session(
         is_install_upgrade,
         module_bytes,
-        casper_types::TransactionRuntime::VmCasperV1,
-        0,
+        TransactionRuntimeParams::VmCasperV1,
         &DEFAULT_ACCOUNT_SECRET_KEY,
     );
 
@@ -111,8 +110,7 @@ fn try_add_contract_version(
 pub fn new_transaction_v1_session(
     is_install_upgrade: bool,
     module_bytes: Bytes,
-    runtime: TransactionRuntime,
-    transferred_value: u64,
+    runtime: TransactionRuntimeParams,
     secret_key: &SecretKey,
 ) -> TransactionV1 {
     let timestamp = Timestamp::now();
@@ -121,8 +119,6 @@ pub fn new_transaction_v1_session(
         is_install_upgrade,
         module_bytes,
         runtime,
-        transferred_value,
-        seed: None,
     };
     let args = TransactionArgs::Named(RuntimeArgs::new());
     let entry_point = TransactionEntryPoint::Call;

diff --git a/executor/wasm-host/src/host.rs b/executor/wasm-host/src/host.rs
@@ -23,10 +23,9 @@ use casper_types::{
     account::AccountHash,
     addressable_entity::{ActionThresholds, AssociatedKeys, NamedKeyAddr},
     AddressableEntity, AddressableEntityHash, BlockHash, ByteCode, ByteCodeAddr, ByteCodeHash,
-    ByteCodeKind, CLType, Digest, EntityAddr, EntityKind, EntryPoint, EntryPointAccess,
-    EntryPointAddr, EntryPointPayment, EntryPointType, EntryPointValue, Groups, HashAddr, Key,
-    Package, PackageHash, PackageStatus, ProtocolVersion, StoredValue, TransactionRuntime, URef,
-    U512,
+    ByteCodeKind, CLType, ContractRuntimeTag, Digest, EntityAddr, EntityKind, EntryPoint,
+    EntryPointAccess, EntryPointAddr, EntryPointPayment, EntryPointType, EntryPointValue, Groups,
+    HashAddr, Key, Package, PackageHash, PackageStatus, ProtocolVersion, StoredValue, URef, U512,
 };
 use either::Either;
 use num_derive::FromPrimitive;
@@ -506,7 +505,7 @@ pub fn casper_create<S: GlobalStateReader + 'static, E: Executor + 'static>(
         main_purse,
         AssociatedKeys::default(),
         ActionThresholds::default(),
-        EntityKind::SmartContract(TransactionRuntime::VmCasperV2),
+        EntityKind::SmartContract(ContractRuntimeTag::VmCasperV2),
     );
 
     caller.context_mut().tracking_copy.write(

diff --git a/executor/wasm/src/lib.rs b/executor/wasm/src/lib.rs
@@ -35,9 +35,9 @@ use casper_types::{
     account::AccountHash,
     addressable_entity::{ActionThresholds, AssociatedKeys},
     bytesrepr, AddressableEntity, AddressableEntityHash, ByteCode, ByteCodeAddr, ByteCodeHash,
-    ByteCodeKind, Digest, EntityAddr, EntityKind, Gas, Groups, InitiatorAddr, Key, Package,
-    PackageHash, PackageStatus, Phase, ProtocolVersion, StoredValue, TransactionInvocationTarget,
-    TransactionRuntime, URef, U512,
+    ByteCodeKind, ContractRuntimeTag, Digest, EntityAddr, EntityKind, Gas, Groups, InitiatorAddr,
+    Key, Package, PackageHash, PackageStatus, Phase, ProtocolVersion, StoredValue,
+    TransactionInvocationTarget, URef, U512,
 };
 use either::Either;
 use install::{InstallContractError, InstallContractRequest, InstallContractResult};
@@ -230,7 +230,7 @@ impl ExecutorV2 {
             main_purse,
             AssociatedKeys::default(),
             ActionThresholds::default(),
-            EntityKind::SmartContract(TransactionRuntime::VmCasperV2),
+            EntityKind::SmartContract(ContractRuntimeTag::VmCasperV2),
         );
 
         tracking_copy.write(
@@ -374,7 +374,7 @@ impl ExecutorV2 {
                         let wasm_key = match addressable_entity.kind() {
                             EntityKind::System(_) => todo!(),
                             EntityKind::Account(_) => todo!(),
-                            EntityKind::SmartContract(TransactionRuntime::VmCasperV1) => {
+                            EntityKind::SmartContract(ContractRuntimeTag::VmCasperV1) => {
                                 // We need to short circuit here to execute v1 contracts with legacy
                                 // execut
 
@@ -398,7 +398,7 @@ impl ExecutorV2 {
                                     gas_limit,
                                 );
                             }
-                            EntityKind::SmartContract(TransactionRuntime::VmCasperV2) => {
+                            EntityKind::SmartContract(ContractRuntimeTag::VmCasperV2) => {
                                 Key::ByteCode(ByteCodeAddr::V2CasperWasm(
                                     addressable_entity.byte_code_addr(),
                                 ))

diff --git a/node/src/components/contract_runtime/operations/wasm_v2_request.rs b/node/src/components/contract_runtime/operations/wasm_v2_request.rs
@@ -21,7 +21,7 @@ use casper_storage::{
 };
 use casper_types::{
     execution::Effects, BlockHash, Digest, Gas, Key, TransactionEntryPoint,
-    TransactionInvocationTarget, TransactionTarget, U512,
+    TransactionInvocationTarget, TransactionRuntimeParams, TransactionTarget, U512,
 };
 use thiserror::Error;
 use tracing::info;
@@ -102,6 +102,8 @@ pub(crate) enum InvalidRequest {
     InvalidGasLimit(U512),
     #[error("Expected transferred value")]
     ExpectedTransferredValue,
+    #[error("Expected V2 runtime")]
+    ExpectedV2Runtime,
 }
 
 impl WasmV2Request {
@@ -139,6 +141,7 @@ impl WasmV2Request {
             Install {
                 module_bytes: Bytes,
                 entry_point: String,
+                transferred_value: u64,
                 seed: Option<[u8; 32]>,
             },
             Session {
@@ -153,22 +156,28 @@ impl WasmV2Request {
         let target = transaction.target().ok_or(InvalidRequest::ExpectedTarget)?;
         let target = match target {
             TransactionTarget::Native => todo!(), //
-            TransactionTarget::Stored {
-                id,
-                runtime: _,
-                transferred_value: _,
-            } => match transaction.entry_point() {
+            TransactionTarget::Stored { id, runtime: _ } => match transaction.entry_point() {
                 TransactionEntryPoint::Custom(entry_point) => Target::Stored {
                     id: id.clone(),
                     entry_point: entry_point.clone(),
                 },
                 _ => todo!(),
             },
+
+            TransactionTarget::Session {
+                module_bytes: _,
+                runtime: TransactionRuntimeParams::VmCasperV1,
+                is_install_upgrade: _, // TODO: Handle this
+            } => {
+                return Err(InvalidRequest::ExpectedV2Runtime);
+            }
             TransactionTarget::Session {
                 module_bytes,
-                runtime: _,
-                transferred_value: _,
-                seed,
+                runtime:
+                    TransactionRuntimeParams::VmCasperV2 {
+                        transferred_value,
+                        seed,
+                    },
                 is_install_upgrade: _, // TODO: Handle this
             } => match transaction.entry_point() {
                 TransactionEntryPoint::Call => Target::Session {
@@ -177,6 +186,7 @@ impl WasmV2Request {
                 TransactionEntryPoint::Custom(entry_point) => Target::Install {
                     module_bytes: module_bytes.clone().take_inner().into(),
                     entry_point: entry_point.to_string(),
+                    transferred_value,
                     seed,
                 },
                 _ => todo!(),
@@ -189,6 +199,7 @@ impl WasmV2Request {
             Target::Install {
                 module_bytes,
                 entry_point,
+                transferred_value,
                 seed,
             } => {
                 let mut builder = InstallContractRequestBuilder::default();
@@ -213,6 +224,10 @@ impl WasmV2Request {
                     builder = builder.with_seed(seed);
                 }
 
+                // Value is expected to be the same as transferred value, it's just taken through
+                // different API.
+                debug_assert_eq!(transferred_value, value);
+
                 let install_request = builder
                     .with_initiator(initiator_addr.account_hash())
                     .with_gas_limit(gas_limit)

diff --git a/node/src/components/transaction_acceptor.rs b/node/src/components/transaction_acceptor.rs
@@ -6,7 +6,7 @@ mod tests;
 
 use std::{collections::BTreeSet, fmt::Debug, sync::Arc};
 
-use casper_types::{InvalidTransaction, InvalidTransactionV1};
+use casper_types::{ContractRuntimeTag, InvalidTransaction, InvalidTransactionV1};
 use datasize::DataSize;
 use prometheus::Registry;
 use tracing::{debug, error, trace};
@@ -19,7 +19,7 @@ use casper_types::{
     EntityKind, EntityVersion, EntityVersionKey, ExecutableDeployItem,
     ExecutableDeployItemIdentifier, InitiatorAddr, Key, Package, PackageAddr, PackageHash,
     PackageIdentifier, Timestamp, Transaction, TransactionEntryPoint, TransactionInvocationTarget,
-    TransactionRuntime, TransactionTarget, DEFAULT_ENTRY_POINT_NAME, U512,
+    TransactionTarget, DEFAULT_ENTRY_POINT_NAME, U512,
 };
 
 use crate::{
@@ -657,7 +657,7 @@ impl TransactionAcceptor {
         entry_point_exist: bool,
     ) -> Effects<Event> {
         match addressable_entity.kind() {
-            EntityKind::SmartContract(TransactionRuntime::VmCasperV1)
+            EntityKind::SmartContract(ContractRuntimeTag::VmCasperV1)
             | EntityKind::Account(_)
             | EntityKind::System(_) => {
                 if !entry_point_exist {
@@ -672,7 +672,7 @@ impl TransactionAcceptor {
                 }
                 self.validate_transaction_cryptography(effect_builder, event_metadata)
             }
-            EntityKind::SmartContract(TransactionRuntime::VmCasperV2) => {
+            EntityKind::SmartContract(ContractRuntimeTag::VmCasperV2) => {
                 // Engine V2 does not store entrypoint information on chain and relies entirely on
                 // the Wasm itself.
                 self.validate_transaction_cryptography(effect_builder, event_metadata)