Rename Deployer bytecode to initcode

This commit is contained in:
Luke Parker
2025-01-27 15:39:06 -05:00
parent f004c8726f
commit fa0dadc9bd
2 changed files with 10 additions and 10 deletions

View File

@@ -27,15 +27,15 @@ mod abi {
alloy_sol_macro::sol!("contracts/Deployer.sol"); alloy_sol_macro::sol!("contracts/Deployer.sol");
} }
const BYTECODE: &[u8] = { const INITCODE: &[u8] = {
const BYTECODE_HEX: &[u8] = const INITCODE_HEX: &[u8] =
include_bytes!(concat!(env!("OUT_DIR"), "/serai-processor-ethereum-deployer/Deployer.bin")); include_bytes!(concat!(env!("OUT_DIR"), "/serai-processor-ethereum-deployer/Deployer.bin"));
const BYTECODE: [u8; BYTECODE_HEX.len() / 2] = const INITCODE: [u8; INITCODE_HEX.len() / 2] =
match hex::const_decode_to_array::<{ BYTECODE_HEX.len() / 2 }>(BYTECODE_HEX) { match hex::const_decode_to_array::<{ INITCODE_HEX.len() / 2 }>(INITCODE_HEX) {
Ok(bytecode) => bytecode, Ok(initcode) => initcode,
Err(_) => panic!("Deployer.bin did not contain valid hex"), Err(_) => panic!("Deployer.bin did not contain valid hex"),
}; };
&BYTECODE &INITCODE
}; };
/// The Deployer contract for the Serai Router contract. /// The Deployer contract for the Serai Router contract.
@@ -52,7 +52,7 @@ impl Deployer {
/// funded for this transaction to be submitted. This account has no known private key to anyone /// funded for this transaction to be submitted. This account has no known private key to anyone
/// so ETH sent can be neither misappropriated nor returned. /// so ETH sent can be neither misappropriated nor returned.
pub fn deployment_tx() -> Signed<TxLegacy> { pub fn deployment_tx() -> Signed<TxLegacy> {
let bytecode = Bytes::from_static(BYTECODE); let initcode = Bytes::from_static(INITCODE);
// Legacy transactions are used to ensure the widest possible degree of support across EVMs // Legacy transactions are used to ensure the widest possible degree of support across EVMs
let tx = TxLegacy { let tx = TxLegacy {
@@ -87,7 +87,7 @@ impl Deployer {
gas_limit: 300_698, gas_limit: 300_698,
to: TxKind::Create, to: TxKind::Create,
value: U256::ZERO, value: U256::ZERO,
input: bytecode, input: initcode,
}; };
ethereum_primitives::deterministically_sign(tx) ethereum_primitives::deterministically_sign(tx)

View File

@@ -40,7 +40,7 @@ async fn test_deployer() {
} }
// Deploy the deployer with the deployer // Deploy the deployer with the deployer
let mut deploy_tx = Deployer::deploy_tx(crate::BYTECODE.to_vec()); let mut deploy_tx = Deployer::deploy_tx(crate::INITCODE.to_vec());
deploy_tx.gas_price = 100_000_000_000u128; deploy_tx.gas_price = 100_000_000_000u128;
deploy_tx.gas_limit = 1_000_000; deploy_tx.gas_limit = 1_000_000;
{ {
@@ -53,7 +53,7 @@ async fn test_deployer() {
{ {
let deployer = Deployer::new(provider.clone()).await.unwrap().unwrap(); let deployer = Deployer::new(provider.clone()).await.unwrap().unwrap();
let deployed_deployer = deployer let deployed_deployer = deployer
.find_deployment(ethereum_primitives::keccak256(crate::BYTECODE)) .find_deployment(ethereum_primitives::keccak256(crate::INITCODE))
.await .await
.unwrap() .unwrap()
.unwrap(); .unwrap();