Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions common/deposit_contract/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -153,14 +153,13 @@ fn verify_checksum(bytes: &[u8], expected_checksum: &str) {

/// Returns the directory that will be used to store the deposit contract ABI.
fn abi_dir() -> PathBuf {
let base = env::var("CARGO_MANIFEST_DIR")
.expect("should know manifest dir")
let base = env::var("OUT_DIR")
.expect("should know out dir")
.parse::<PathBuf>()
.expect("should parse manifest dir as path")
.join("contracts");
.expect("should parse out dir as path");

std::fs::create_dir_all(base.clone())
.expect("should be able to create abi directory in manifest");
.expect("should be able to create abi directory in out dir");

base
}
22 changes: 16 additions & 6 deletions common/deposit_contract/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,25 @@ impl From<SszDecodeError> for Error {

pub const CONTRACT_DEPLOY_GAS: usize = 4_000_000;
pub const DEPOSIT_GAS: usize = 400_000;
pub const ABI: &[u8] = include_bytes!("../contracts/v0.12.1_validator_registration.json");
pub const BYTECODE: &[u8] = include_bytes!("../contracts/v0.12.1_validator_registration.bytecode");
pub const ABI: &[u8] = include_bytes!(concat!(
env!("OUT_DIR"),
"/v0.12.1_validator_registration.json"
));
pub const BYTECODE: &[u8] = include_bytes!(concat!(
env!("OUT_DIR"),
"/v0.12.1_validator_registration.bytecode"
));
pub const DEPOSIT_DATA_LEN: usize = 420; // lol

pub mod testnet {
pub const ABI: &[u8] =
include_bytes!("../contracts/v0.12.1_testnet_validator_registration.json");
pub const BYTECODE: &[u8] =
include_bytes!("../contracts/v0.12.1_testnet_validator_registration.bytecode");
pub const ABI: &[u8] = include_bytes!(concat!(
env!("OUT_DIR"),
"/v0.12.1_testnet_validator_registration.json"
));
pub const BYTECODE: &[u8] = include_bytes!(concat!(
env!("OUT_DIR"),
"/v0.12.1_testnet_validator_registration.bytecode"
));
}

pub fn encode_eth1_tx_data(deposit_data: &DepositData) -> Result<Vec<u8>, Error> {
Expand Down