Merge branch 'feat-2.0' of github.com:casper-network/casper-node into rustSDK-feat-2.0

# Conflicts:
#	Makefile
#	types/src/transaction/transaction_v1/transaction_v1_builder.rs

Author: gRoussac

Cargo.lock

@@ -159,7 +159,7 @@ lint-smart-contracts:
 
 .PHONY: audit-rs
 audit-rs:
-	$(CARGO) audit --ignore RUSTSEC-2024-0344 --ignore RUSTSEC-2024-0367
+	$(CARGO) audit --ignore RUSTSEC-2024-0344 --ignore RUSTSEC-2024-0367 --ignore RUSTSEC-2024-0371
 
 .PHONY: audit-as
 audit-as:

Makefile

@@ -6,7 +6,7 @@ use casper_types::{
 use crate::{
     binary_response_header::BinaryResponseHeader,
     error_code::ErrorCode,
-    payload_type::{PayloadEntity, PayloadType},
+    response_type::{PayloadEntity, ResponseType},
 };
 
 #[cfg(test)]
@@ -40,7 +40,7 @@ impl BinaryResponse {
 
     /// Creates new binary response from raw bytes.
     pub fn from_raw_bytes(
-        payload_type: PayloadType,
+        payload_type: ResponseType,
         payload: Vec<u8>,
         protocol_version: ProtocolVersion,
     ) -> Self {
@@ -59,7 +59,7 @@ impl BinaryResponse {
             BinaryResponse::new_error(ErrorCode::InternalError, protocol_version),
             |payload| BinaryResponse {
                 payload,
-                header: BinaryResponseHeader::new(Some(V::PAYLOAD_TYPE), protocol_version),
+                header: BinaryResponseHeader::new(Some(V::RESPONSE_TYPE), protocol_version),
             },
         )
     }

binary_port/src/binary_response.rs

@@ -5,7 +5,7 @@ use casper_types::{
 
 use crate::{
     binary_response::BinaryResponse, original_request_context::OriginalRequestContext,
-    payload_type::PayloadEntity, PayloadType,
+    response_type::PayloadEntity, ResponseType,
 };
 
 use crate::record_id::RecordId;
@@ -37,14 +37,14 @@ impl BinaryResponseAndRequest {
         }
     }
 
-    /// Returns a new binary response with specified data and no original request.    
+    /// Returns a new binary response with specified data and no original request.
     pub fn new_test_response<A: PayloadEntity + ToBytes>(
         record_id: RecordId,
         data: &A,
         protocol_version: ProtocolVersion,
     ) -> BinaryResponseAndRequest {
         let response = BinaryResponse::from_raw_bytes(
-            PayloadType::from_record_id(record_id, false),
+            ResponseType::from_record_id(record_id, false),
             data.to_bytes().unwrap(),
             protocol_version,
         );
@@ -58,7 +58,7 @@ impl BinaryResponseAndRequest {
         protocol_version: ProtocolVersion,
     ) -> BinaryResponseAndRequest {
         let response = BinaryResponse::from_raw_bytes(
-            PayloadType::from_record_id(record_id, true),
+            ResponseType::from_record_id(record_id, true),
             bincode::serialize(data).unwrap(),
             protocol_version,
         );

binary_port/src/binary_response_and_request.rs

@@ -1,4 +1,4 @@
-use crate::{error_code::ErrorCode, payload_type::PayloadType};
+use crate::{error_code::ErrorCode, response_type::ResponseType};
 use casper_types::{
     bytesrepr::{self, FromBytes, ToBytes},
     ProtocolVersion,
@@ -19,7 +19,10 @@ pub struct BinaryResponseHeader {
 
 impl BinaryResponseHeader {
     /// Creates new binary response header representing success.
-    pub fn new(returned_data_type: Option<PayloadType>, protocol_version: ProtocolVersion) -> Self {
+    pub fn new(
+        returned_data_type: Option<ResponseType>,
+        protocol_version: ProtocolVersion,
+    ) -> Self {
         Self {
             protocol_version,
             error: ErrorCode::NoError as u16,