Merge pull request #5377 from zajko/vm2_transactions_call_by_package_hash

Removing the limitation of TransactionV1 with targeting VM2 which pre…

Author: darthsiroftardis

Cargo.lock

@@ -369,6 +369,7 @@ pub enum ErrorCode {
     #[error("Transaction attempts to set a delegation amount above the highest allowed value")]
     InvalidDelegationAmount = 116,
     #[error("the transaction invocation target is unsupported under V2 runtime")]
+    // This code is not used, but we had a production release with it so we can't reuse it
     UnsupportedInvocationTarget = 117,
 }
 
@@ -568,9 +569,6 @@ impl From<InvalidTransactionV1> for ErrorCode {
             InvalidTransactionV1::InvalidDelegationAmount { .. } => {
                 ErrorCode::InvalidDelegationAmount
             }
-            InvalidTransactionV1::UnsupportedInvocationTarget { .. } => {
-                ErrorCode::UnsupportedInvocationTarget
-            }
             InvalidTransactionV1::MissingSeed => ErrorCode::InvalidTransactionMissingSeed,
             _other => ErrorCode::InvalidTransactionUnspecified,
         }

binary_port/src/error_code.rs

@@ -7,7 +7,9 @@ use casper_executor_wasm::testing::{
 };
 
 use casper_executor_wasm::{chainspec_config, chainspec_config::ChainspecConfig};
-use casper_executor_wasm_interface::executor::{ExecuteWithProviderError, ExecutionKind};
+use casper_executor_wasm_interface::executor::{
+    ExecuteWithProviderError, ExecutionKind, PackagePointer,
+};
 use casper_storage::global_state::state::CommitProvider;
 use once_cell::sync::Lazy;
 
@@ -174,8 +176,10 @@ fn run_pairing_endpoint_test<T: BorshSerialize>(
         .with_shared_address_generator(Arc::clone(&address_generator))
         .with_transferred_value(0)
         .with_execution_kind(ExecutionKind::Stored {
-            address: contract_address,
+            package_pointer: PackagePointer::HashAddr(contract_address),
             entry_point: "pairing".to_owned(),
+            version: None,
+            protocol_version_major: None,
         })
         .with_serialized_input(input)
         .expect("expected serialized input to be correct")

executor/wasm/src/lib.rs

@@ -10,7 +10,7 @@ use casper_executor_wasm::{
 };
 
 use casper_executor_wasm::{chainspec_config, chainspec_config::ChainspecConfig};
-use casper_executor_wasm_interface::executor::ExecutionKind;
+use casper_executor_wasm_interface::executor::{ExecutionKind, PackagePointer};
 use casper_storage::global_state::state::CommitProvider;
 use once_cell::sync::Lazy;
 
@@ -77,8 +77,10 @@ fn should_run_test_suite() {
         .with_shared_address_generator(Arc::clone(&address_generator))
         .with_transferred_value(0)
         .with_execution_kind(ExecutionKind::Stored {
-            address: contract_address,
+            package_pointer: PackagePointer::HashAddr(contract_address),
             entry_point: "assertions".to_owned(),
+            version: None,
+            protocol_version_major: None,
         })
         .build()
         .expect("should build");
@@ -145,8 +147,10 @@ fn inserting_into_non_existing_vec_index_fails() {
         .with_shared_address_generator(Arc::clone(&address_generator))
         .with_transferred_value(0)
         .with_execution_kind(ExecutionKind::Stored {
-            address: contract_address,
+            package_pointer: PackagePointer::HashAddr(contract_address),
             entry_point: "test_remove_invalid_index_prepare".to_owned(),
+            version: None,
+            protocol_version_major: None,
         })
         .build()
         .expect("should build");

executor/wasm/tests/altbn128.rs

@@ -10,8 +10,8 @@ use casper_executor_wasm::{
     ExecutorV2,
 };
 use casper_executor_wasm_interface::{
-    executor::ExecutionKind,
-    install::{InstallContractResult, InstallContractWithProviderResult},
+    executor::{ExecutionKind, PackagePointer},
+    install::InstallContractWithProviderResult,
 };
 use casper_storage::{
     data_access_layer::{QueryRequest, QueryResult},
@@ -95,8 +95,10 @@ fn should_store_state_after_changes() {
         .with_shared_address_generator(Arc::clone(&address_generator))
         .with_transferred_value(0)
         .with_execution_kind(ExecutionKind::Stored {
-            address: contract_address,
+            package_pointer: PackagePointer::HashAddr(contract_address),
             entry_point: "spanish".to_owned(),
+            version: None,
+            protocol_version_major: None,
         })
         .build()
         .expect("should build");
@@ -115,8 +117,10 @@ fn should_store_state_after_changes() {
         .with_shared_address_generator(Arc::clone(&address_generator))
         .with_transferred_value(0)
         .with_execution_kind(ExecutionKind::Stored {
-            address: contract_address,
+            package_pointer: PackagePointer::HashAddr(contract_address),
             entry_point: "french".to_owned(),
+            version: None,
+            protocol_version_major: None,
         })
         .build()
         .expect("should build");
@@ -176,8 +180,10 @@ fn should_fetch_data_with_contract_method() {
         .with_shared_address_generator(Arc::clone(&address_generator))
         .with_transferred_value(0)
         .with_execution_kind(ExecutionKind::Stored {
-            address: contract_address,
+            package_pointer: PackagePointer::HashAddr(contract_address),
             entry_point: "spanish".to_owned(),
+            version: None,
+            protocol_version_major: None,
         })
         .build()
         .expect("should build");
@@ -196,8 +202,10 @@ fn should_fetch_data_with_contract_method() {
         .with_shared_address_generator(Arc::clone(&address_generator))
         .with_transferred_value(0)
         .with_execution_kind(ExecutionKind::Stored {
-            address: contract_address,
+            package_pointer: PackagePointer::HashAddr(contract_address),
             entry_point: "get".to_owned(),
+            version: None,
+            protocol_version_major: None,
         })
         .build()
         .expect("should build");