Skip to content

Commit aeca0f9

Browse files
committed
fmt
1 parent ef1b273 commit aeca0f9

3 files changed

Lines changed: 22 additions & 12 deletions

File tree

crates/handler/src/execution.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@ pub fn create_init_frame(
3131
return_memory_offset: 0..0,
3232
}))
3333
}
34-
TxKind::Create => FrameInput::Create(Box::new(CreateInputs::new(tx.caller(), CreateScheme::Create, tx.value(), input, gas_limit))),
34+
TxKind::Create => FrameInput::Create(Box::new(CreateInputs::new(
35+
tx.caller(),
36+
CreateScheme::Create,
37+
tx.value(),
38+
input,
39+
gas_limit,
40+
))),
3541
}
3642
}

crates/interpreter/src/instructions/contract.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,13 @@ pub fn create<WIRE: InterpreterTypes, const IS_CREATE2: bool, H: Host + ?Sized>(
9595
.interpreter
9696
.bytecode
9797
.set_action(InterpreterAction::NewFrame(FrameInput::Create(Box::new(
98-
CreateInputs::new(context.interpreter.input.target_address(), scheme, value, code, gas_limit),
98+
CreateInputs::new(
99+
context.interpreter.input.target_address(),
100+
scheme,
101+
value,
102+
code,
103+
gas_limit,
104+
),
99105
))));
100106
}
101107

crates/interpreter/src/interpreter_action/create_inputs.rs

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use context_interface::CreateScheme;
2-
use primitives::{Address, Bytes, U256};
32
use core::cell::OnceCell;
3+
use primitives::{Address, Bytes, U256};
44

55
/// Inputs for a create call
66
#[derive(Clone, Debug, Default, PartialEq, Eq)]
@@ -40,19 +40,17 @@ impl CreateInputs {
4040
cached_address: OnceCell::new(),
4141
}
4242
}
43-
43+
4444
/// Returns the address that this create call will create.
4545
///
4646
/// The result is cached to avoid redundant keccak computations.
4747
pub fn created_address(&self, nonce: u64) -> Address {
48-
*self.cached_address.get_or_init(|| {
49-
match self.scheme {
50-
CreateScheme::Create => self.caller.create(nonce),
51-
CreateScheme::Create2 { salt } => self
52-
.caller
53-
.create2_from_code(salt.to_be_bytes(), &self.init_code),
54-
CreateScheme::Custom { address } => address,
55-
}
48+
*self.cached_address.get_or_init(|| match self.scheme {
49+
CreateScheme::Create => self.caller.create(nonce),
50+
CreateScheme::Create2 { salt } => self
51+
.caller
52+
.create2_from_code(salt.to_be_bytes(), &self.init_code),
53+
CreateScheme::Custom { address } => address,
5654
})
5755
}
5856
}

0 commit comments

Comments
 (0)