refactor: remove revive references from e2e crate

Author: AlexD10S

Cargo.lock

@@ -24,7 +24,6 @@ ink_sandbox = { version = "=6.0.0-alpha.4", path = "./sandbox", optional = true
 
 cargo_metadata = { workspace = true }
 contract-build = { workspace = true }
-pallet-revive = { workspace = true }
 funty = { workspace = true }
 impl-serde = { workspace = true }
 jsonrpsee = { workspace = true, features = ["ws-client"] }

crates/e2e/Cargo.toml

@@ -22,7 +22,7 @@ use ink_primitives::{
     abi::AbiEncodeWith,
 };
 use jsonrpsee::core::async_trait;
-use pallet_revive::evm::CallTrace;
+use ink_revive::evm::CallTrace;
 use sp_weights::Weight;
 use subxt::dynamic::Value;
 

crates/e2e/src/backend.rs

@@ -36,7 +36,7 @@ use ink_primitives::{
     H256,
     MessageResult,
 };
-use pallet_revive::{
+use ink_revive::{
     CodeUploadResult,
     ExecReturnValue,
     InstantiateReturnValue,

crates/e2e/src/contract_results.rs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use pallet_revive::evm::CallTrace;
+use ink_revive::evm::CallTrace;
 use std::fmt;
 
 /// An error occurred while interacting with the E2E backend.

crates/e2e/src/error.rs

@@ -57,7 +57,7 @@ pub use node_proc::{
     TestNodeProcess,
     TestNodeProcessBuilder,
 };
-pub use pallet_revive::evm::CallTrace;
+pub use ink_revive::evm::CallTrace;
 #[cfg(feature = "sandbox")]
 pub use sandbox_client::{
     Client as SandboxClient,

crates/e2e/src/lib.rs

@@ -60,6 +60,7 @@ use ink_primitives::{
     DepositLimit,
     H160,
     abi::AbiEncodeWith,
+    U256
 };
 use ink_sandbox::{
     AccountIdFor,
@@ -73,19 +74,24 @@ use ink_sandbox::{
     pallet_revive,
 };
 use jsonrpsee::core::async_trait;
-use pallet_revive::{
-    AddressMapper,
+use ink_revive::{
+    ExecReturnValue,
     CodeUploadReturnValue,
     InstantiateReturnValue,
-    MomentOf,
     evm::{
         CallTrace,
-        CallTracerConfig,
-        Trace,
-        TracerType,
-        U256,
+        CallLog
     },
 };
+use pallet_revive::{
+    AddressMapper,
+    MomentOf, 
+    evm::{
+        TracerType,
+        Trace,
+        CallTracerConfig,
+    }
+};
 use scale::Decode;
 use sp_core::{
     Pair as _,
@@ -360,7 +366,7 @@ where
         };
 
         let trace = match tracer.collect_trace() {
-            Some(Trace::Call(call_trace)) => Some(call_trace),
+            Some(Trace::Call(call_trace)) => Some(to_revive_trace(call_trace)),
             _ => None,
         };
 
@@ -444,10 +450,13 @@ where
         let result = ContractResult::<InstantiateReturnValue, E::Balance> {
             gas_consumed: dry_run_result.gas_consumed,
             gas_required: dry_run_result.gas_required,
-            storage_deposit: dry_run_result.storage_deposit,
+            storage_deposit: to_revive_storage_deposit(dry_run_result.storage_deposit),
             result: dry_run_result.result.map(|res| {
                 InstantiateReturnValue {
-                    result: res.result,
+                    result: ExecReturnValue {
+                        flags: res.result.flags,
+                        data: res.result.data,
+                    },
                     addr: res.addr,
                 }
             }),
@@ -556,7 +565,7 @@ where
                 .map_err(|err| SandboxErr::new(format!("bare_call: {err:?}")))
         })?;
         let trace = match tracer.collect_trace() {
-            Some(Trace::Call(call_trace)) => Some(call_trace),
+            Some(Trace::Call(call_trace)) => Some(to_revive_trace(call_trace)),
             _ => None,
         };
 
@@ -630,8 +639,13 @@ where
             exec_result: ContractExecResultFor::<E> {
                 gas_consumed: result.gas_consumed,
                 gas_required: result.gas_required,
-                storage_deposit: result.storage_deposit,
-                result: result.result,
+                storage_deposit: to_revive_storage_deposit(result.storage_deposit),
+                result: result.result.map(|res| {
+                    ExecReturnValue {
+                            flags: res.flags,
+                            data: res.data,
+                        }
+                }),
             },
             trace: None, // todo
             _marker: Default::default(),
@@ -829,3 +843,48 @@ where
     let origin = RawOrigin::Signed(caller);
     OriginFor::<S::Runtime>::from(origin)
 }
+
+
+/// Convert a `pallet_revive::CallTrace` (sandbox) into an `ink_revive::CallTrace` (API).
+fn to_revive_trace(t: pallet_revive::evm::CallTrace) -> CallTrace {
+    CallTrace {
+        from: t.from,
+        gas: t.gas,
+        gas_used: t.gas_used,
+        to: t.to,
+        input: t.input.0,
+        output: t.output.0,
+        error: t.error,
+        revert_reason: t.revert_reason,
+        calls: t.calls.into_iter().map(to_revive_trace).collect(),
+        logs: t.logs.into_iter().map(|log| CallLog {
+            address: log.address,
+            topics: log.topics,
+            data: log.data.0,
+            ..Default::default()
+        }).collect(),
+        value: t.value,
+        call_type: to_revive_call_type(t.call_type),
+    }
+}
+
+/// Convert a `pallet_revive::CallType` into an `ink_revive::evm::CallType`.
+fn to_revive_call_type(ct: pallet_revive::evm::CallType) -> ink_revive::evm::CallType {
+    match ct {
+        pallet_revive::evm::CallType::Call => ink_revive::evm::CallType::Call,
+        pallet_revive::evm::CallType::StaticCall => ink_revive::evm::CallType::StaticCall,
+        pallet_revive::evm::CallType::DelegateCall => ink_revive::evm::CallType::DelegateCall,
+        pallet_revive::evm::CallType::Create => ink_revive::evm::CallType::Create,
+        pallet_revive::evm::CallType::Create2 => ink_revive::evm::CallType::Create2,
+    }
+}
+
+/// Convert a `ink_revive::StorageDeposit` into an `ink_revive::StorageDeposit`.
+fn to_revive_storage_deposit<B>(
+    sd: pallet_revive::StorageDeposit<B>,
+) -> ink_revive::StorageDeposit<B> {
+    match sd {
+        pallet_revive::StorageDeposit::Charge(b) => ink_revive::StorageDeposit::Charge(b),
+        pallet_revive::StorageDeposit::Refund(b) => ink_revive::StorageDeposit::Refund(b),
+    }
+}

crates/e2e/src/sandbox_client.rs

@@ -74,7 +74,7 @@ use ink_primitives::{
     abi::AbiEncodeWith,
 };
 use jsonrpsee::core::async_trait;
-use pallet_revive::evm::CallTrace;
+use ink_revive::evm::CallTrace;
 use scale::{
     Decode,
     Encode,

crates/e2e/src/subxt_client.rs

@@ -29,7 +29,7 @@ use ink_primitives::{
     Address,
     DepositLimit,
 };
-use pallet_revive::{
+use ink_revive::{
     CodeUploadResult,
     evm::{
         CallTrace,

crates/e2e/src/xts.rs

@@ -19,8 +19,8 @@ frame-support = { workspace = true }
 scale-info = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 ink_primitives = { workspace = true }
-# sp-weights = { workspace = true }
-# sp-core = { workspace = true }
+derive_more = { workspace = true, features = ["from", "try_into"] }
+sp-core = { workspace = true }
 sp-runtime = { workspace = true }
 pallet-revive-uapi = { workspace = true, features = ["scale"] }
 alloy-core = { workspace = true, features = ["sol-types"] }
@@ -34,7 +34,7 @@ std = [
     "frame-support/std",
     "ink_primitives/std",
     # "sp-weights/std",
-    # "sp-core/std",
+    "sp-core/std",
     "sp-runtime/std",
     "serde/std",
 ]