Return deployed bytecode on eth_call contract creation

lib/ain-evm/src/evm.rs

@@ -137,7 +137,7 @@ impl EVMHandler {
         )
         .map_err(|e| anyhow!("------ Could not restore backend {}", e))?;
         Ok(AinExecutor::new(&mut backend).call(ExecutorContext {
-            caller,
+            caller: caller.unwrap_or_default(),
             to,
             value,
             data,

lib/ain-evm/src/executor.rs

@@ -10,9 +10,9 @@ use crate::{
 use ethereum::{EIP658ReceiptData, Log, ReceiptV3};
 use ethereum_types::{Bloom, U256};
 use evm::{
-    backend::ApplyBackend,
+    backend::{ApplyBackend, Backend},
     executor::stack::{MemoryStackState, StackExecutor, StackSubstateMetadata},
-    Config, ExitReason,
+    Config, CreateScheme, ExitReason,
 };
 use log::trace;
 use primitive_types::{H160, H256};
@@ -58,20 +58,26 @@ impl<'backend> Executor for AinExecutor<'backend> {
 
         let (exit_reason, data) = match ctx.to {
             Some(address) => executor.transact_call(
-                ctx.caller.unwrap_or_default(),
+                ctx.caller,
                 address,
                 ctx.value,
                 ctx.data.to_vec(),
                 ctx.gas_limit,
                 access_list,
             ),
-            None => executor.transact_create(
-                ctx.caller.unwrap_or_default(),
-                ctx.value,
-                ctx.data.to_vec(),
-                ctx.gas_limit,
-                access_list,
-            ),
+            None => {
+                let contract_address =
+                    executor.create_address(CreateScheme::Legacy { caller: ctx.caller });
+                let (exit_reason, _) = executor.transact_create(
+                    ctx.caller,
+                    ctx.value,
+                    ctx.data.to_vec(),
+                    ctx.gas_limit,
+                    access_list,
+                );
+                let code = executor.state().code(contract_address);
+                (exit_reason, code)
+            }
         };
 
         TxResponse {
@@ -90,7 +96,7 @@ impl<'backend> Executor for AinExecutor<'backend> {
             self.backend.vicinity
         );
         let ctx = ExecutorContext {
-            caller: Some(signed_tx.sender),
+            caller: signed_tx.sender,
             to: signed_tx.to(),
             value: signed_tx.value(),
             data: signed_tx.data(),
@@ -114,15 +120,15 @@ impl<'backend> Executor for AinExecutor<'backend> {
 
         let (exit_reason, data) = match ctx.to {
             Some(address) => executor.transact_call(
-                ctx.caller.unwrap_or_default(),
+                ctx.caller,
                 address,
                 ctx.value,
                 ctx.data.to_vec(),
                 ctx.gas_limit,
                 access_list,
             ),
             None => executor.transact_create(
-                ctx.caller.unwrap_or_default(),
+                ctx.caller,
                 ctx.value,
                 ctx.data.to_vec(),
                 ctx.gas_limit,

lib/ain-evm/src/traits.rs

@@ -5,7 +5,7 @@ use primitive_types::{H160, U256};
 
 #[derive(Debug)]
 pub struct ExecutorContext<'a> {
-    pub caller: Option<H160>,
+    pub caller: H160,
     pub to: Option<H160>,
     pub value: U256,
     pub data: &'a [u8],