Skip to content

Commit f6ab9d8

Browse files
hedgar2017hedgar2017
authored
chore: remove all traces of the EVM codegen (#329)
1 parent 9a94dc1 commit f6ab9d8

20 files changed

Lines changed: 166 additions & 138 deletions

File tree

‎Cargo.lock‎

Lines changed: 102 additions & 70 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎era-compiler-solidity/src/lib.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ pub fn yul_to_eravm(
5656
solc_path: Option<String>,
5757
messages: &mut Vec<era_solc::StandardJsonOutputError>,
5858
enable_eravm_extensions: bool,
59-
metadata_hash_type: era_compiler_common::EraVMMetadataHashType,
59+
metadata_hash_type: era_compiler_common::MetadataHashType,
6060
append_cbor: bool,
6161
optimizer_settings: era_compiler_llvm_context::OptimizerSettings,
6262
llvm_options: Vec<String>,
@@ -112,7 +112,7 @@ pub fn llvm_ir_to_eravm(
112112
paths: &[PathBuf],
113113
libraries: &[String],
114114
messages: &mut Vec<era_solc::StandardJsonOutputError>,
115-
metadata_hash_type: era_compiler_common::EraVMMetadataHashType,
115+
metadata_hash_type: era_compiler_common::MetadataHashType,
116116
append_cbor: bool,
117117
optimizer_settings: era_compiler_llvm_context::OptimizerSettings,
118118
llvm_options: Vec<String>,
@@ -149,7 +149,7 @@ pub fn llvm_ir_to_eravm(
149149
pub fn eravm_assembly_to_eravm(
150150
paths: &[PathBuf],
151151
messages: &mut Vec<era_solc::StandardJsonOutputError>,
152-
metadata_hash_type: era_compiler_common::EraVMMetadataHashType,
152+
metadata_hash_type: era_compiler_common::MetadataHashType,
153153
append_cbor: bool,
154154
llvm_options: Vec<String>,
155155
output_assembly: bool,
@@ -188,7 +188,7 @@ pub fn standard_output_eravm(
188188
codegen: Option<era_solc::StandardJsonInputCodegen>,
189189
evm_version: Option<era_compiler_common::EVMVersion>,
190190
enable_eravm_extensions: bool,
191-
metadata_hash_type: era_compiler_common::EraVMMetadataHashType,
191+
metadata_hash_type: era_compiler_common::MetadataHashType,
192192
append_cbor: bool,
193193
metadata_literal: bool,
194194
base_path: Option<String>,
@@ -305,7 +305,7 @@ pub fn standard_json_eravm(
305305
solc_input.settings.enable_eravm_extensions || enable_eravm_extensions;
306306
let detect_missing_libraries =
307307
solc_input.settings.detect_missing_libraries || detect_missing_libraries;
308-
let metadata_hash_type = era_compiler_common::EraVMMetadataHashType::from_str(
308+
let metadata_hash_type = era_compiler_common::MetadataHashType::from_str(
309309
solc_input.settings.metadata.hash_type.as_str(),
310310
)?;
311311
let append_cbor = solc_input.settings.metadata.append_cbor;
@@ -461,7 +461,7 @@ pub fn combined_json_eravm(
461461
codegen: Option<era_solc::StandardJsonInputCodegen>,
462462
evm_version: Option<era_compiler_common::EVMVersion>,
463463
enable_eravm_extensions: bool,
464-
metadata_hash_type: era_compiler_common::EraVMMetadataHashType,
464+
metadata_hash_type: era_compiler_common::MetadataHashType,
465465
append_cbor: bool,
466466
metadata_literal: bool,
467467
base_path: Option<String>,

‎era-compiler-solidity/src/process/input_eravm.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pub struct Input {
2727
/// Factory dependencies.
2828
pub factory_dependencies: BTreeSet<String>,
2929
/// The metadata hash type.
30-
pub metadata_hash_type: era_compiler_common::EraVMMetadataHashType,
30+
pub metadata_hash_type: era_compiler_common::MetadataHashType,
3131
/// Append the CBOR metadata at the end of bytecode.
3232
pub append_cbor: bool,
3333
/// The optimizer settings.
@@ -51,7 +51,7 @@ impl Input {
5151
missing_libraries: BTreeSet<String>,
5252
factory_dependencies: BTreeSet<String>,
5353
enable_eravm_extensions: bool,
54-
metadata_hash_type: era_compiler_common::EraVMMetadataHashType,
54+
metadata_hash_type: era_compiler_common::MetadataHashType,
5555
append_cbor: bool,
5656
optimizer_settings: era_compiler_llvm_context::OptimizerSettings,
5757
llvm_options: Vec<String>,

‎era-compiler-solidity/src/project/contract/mod.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ impl Contract {
7070
missing_libraries: BTreeSet<String>,
7171
factory_dependencies: BTreeSet<String>,
7272
enable_eravm_extensions: bool,
73-
metadata_hash_type: era_compiler_common::EraVMMetadataHashType,
73+
metadata_hash_type: era_compiler_common::MetadataHashType,
7474
append_cbor: bool,
7575
optimizer_settings: era_compiler_llvm_context::OptimizerSettings,
7676
llvm_options: Vec<String>,
@@ -96,12 +96,12 @@ impl Contract {
9696
let metadata_json = serde_json::to_value(&metadata).expect("Always valid");
9797
let metadata_json_bytes = serde_json::to_vec(&metadata_json).expect("Always valid");
9898
let metadata_bytes = match metadata_hash_type {
99-
era_compiler_common::EraVMMetadataHashType::None => None,
100-
era_compiler_common::EraVMMetadataHashType::Keccak256 => Some(
99+
era_compiler_common::MetadataHashType::None => None,
100+
era_compiler_common::MetadataHashType::Keccak256 => Some(
101101
era_compiler_common::Keccak256Hash::from_slice(metadata_json_bytes.as_slice())
102102
.into(),
103103
),
104-
era_compiler_common::EraVMMetadataHashType::IPFS => Some(
104+
era_compiler_common::MetadataHashType::IPFS => Some(
105105
era_compiler_common::IPFSHash::from_slice(metadata_json_bytes.as_slice()).into(),
106106
),
107107
};

‎era-compiler-solidity/src/project/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ impl Project {
359359
self,
360360
messages: &mut Vec<era_solc::StandardJsonOutputError>,
361361
enable_eravm_extensions: bool,
362-
metadata_hash_type: era_compiler_common::EraVMMetadataHashType,
362+
metadata_hash_type: era_compiler_common::MetadataHashType,
363363
append_cbor: bool,
364364
optimizer_settings: era_compiler_llvm_context::OptimizerSettings,
365365
llvm_options: Vec<String>,

‎era-compiler-solidity/src/zksolc/arguments.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,7 @@ impl Arguments {
260260
));
261261
}
262262

263-
if self.metadata_hash
264-
== Some(era_compiler_common::EraVMMetadataHashType::Keccak256.to_string())
263+
if self.metadata_hash == Some(era_compiler_common::MetadataHashType::Keccak256.to_string())
265264
{
266265
messages.push(era_solc::StandardJsonOutputError::new_warning(
267266
"`keccak256` metadata hash type is deprecated. Please use `ipfs` instead.",

‎era-compiler-solidity/src/zksolc/main.rs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ fn main_inner(
8080
return Ok(());
8181
}
8282

83-
era_compiler_llvm_context::initialize_target(era_compiler_common::Target::EraVM);
83+
era_compiler_llvm_context::initialize_target();
8484

8585
if arguments.recursive_process {
8686
return era_compiler_solidity::run_recursive();
@@ -146,10 +146,8 @@ fn main_inner(
146146
let append_cbor = !arguments.no_cbor_metadata;
147147

148148
let metadata_hash_type = match arguments.metadata_hash {
149-
Some(ref hash_type) => {
150-
era_compiler_common::EraVMMetadataHashType::from_str(hash_type.as_str())?
151-
}
152-
None => era_compiler_common::EraVMMetadataHashType::IPFS,
149+
Some(ref hash_type) => era_compiler_common::MetadataHashType::from_str(hash_type.as_str())?,
150+
None => era_compiler_common::MetadataHashType::IPFS,
153151
};
154152

155153
let build = if arguments.yul {

‎era-compiler-solidity/tests/cli/metadata_hash.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
//! CLI tests for the eponymous option.
33
//!
44
5-
use era_compiler_common::EraVMMetadataHashType;
5+
use era_compiler_common::MetadataHashType;
66
use predicates::prelude::*;
77
use test_case::test_case;
88

9-
#[test_case(EraVMMetadataHashType::None.to_string())]
9+
#[test_case(MetadataHashType::None.to_string())]
1010
fn none(hash_type: String) -> anyhow::Result<()> {
1111
crate::common::setup()?;
1212

@@ -23,7 +23,7 @@ fn none(hash_type: String) -> anyhow::Result<()> {
2323
Ok(())
2424
}
2525

26-
#[test_case(EraVMMetadataHashType::IPFS.to_string())]
26+
#[test_case(MetadataHashType::IPFS.to_string())]
2727
fn ipfs(hash_type: String) -> anyhow::Result<()> {
2828
crate::common::setup()?;
2929

@@ -44,7 +44,7 @@ fn ipfs(hash_type: String) -> anyhow::Result<()> {
4444
fn keccak256() -> anyhow::Result<()> {
4545
crate::common::setup()?;
4646

47-
let hash_type = EraVMMetadataHashType::Keccak256.to_string();
47+
let hash_type = MetadataHashType::Keccak256.to_string();
4848
let args = &[
4949
"--metadata-hash",
5050
hash_type.as_str(),

‎era-compiler-solidity/tests/cli/no_cbor_metadata.rs‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
//! CLI tests for the eponymous option.
33
//!
44
5-
use era_compiler_common::EVMMetadataHashType;
6-
use era_compiler_common::EraVMMetadataHashType;
5+
use era_compiler_common::MetadataHashType;
76
use predicates::prelude::*;
87
use test_case::test_case;
98

10-
#[test_case(EraVMMetadataHashType::None.to_string())]
9+
#[test_case(MetadataHashType::None.to_string())]
1110
fn none(hash_type: String) -> anyhow::Result<()> {
1211
let _ = crate::common::setup();
1312

@@ -29,7 +28,7 @@ fn none(hash_type: String) -> anyhow::Result<()> {
2928
Ok(())
3029
}
3130

32-
#[test_case(EVMMetadataHashType::IPFS.to_string())]
31+
#[test_case(MetadataHashType::IPFS.to_string())]
3332
fn ipfs_solidity(hash_type: String) -> anyhow::Result<()> {
3433
let _ = crate::common::setup();
3534

@@ -51,7 +50,7 @@ fn ipfs_solidity(hash_type: String) -> anyhow::Result<()> {
5150
Ok(())
5251
}
5352

54-
#[test_case(EVMMetadataHashType::IPFS.to_string())]
53+
#[test_case(MetadataHashType::IPFS.to_string())]
5554
fn ipfs_yul(hash_type: String) -> anyhow::Result<()> {
5655
let _ = crate::common::setup();
5756

@@ -74,7 +73,7 @@ fn ipfs_yul(hash_type: String) -> anyhow::Result<()> {
7473
Ok(())
7574
}
7675

77-
#[test_case(crate::common::TEST_LLVM_IR_CONTRACT_ERAVM_PATH, EraVMMetadataHashType::IPFS.to_string())]
76+
#[test_case(crate::common::TEST_LLVM_IR_CONTRACT_ERAVM_PATH, MetadataHashType::IPFS.to_string())]
7877
fn ipfs_llvm_ir(path: &str, hash_type: String) -> anyhow::Result<()> {
7978
let _ = crate::common::setup();
8079

@@ -101,7 +100,7 @@ fn ipfs_llvm_ir(path: &str, hash_type: String) -> anyhow::Result<()> {
101100
fn ipfs_eravm_assembly() -> anyhow::Result<()> {
102101
let _ = crate::common::setup();
103102

104-
let hash_type = EraVMMetadataHashType::IPFS.to_string();
103+
let hash_type = MetadataHashType::IPFS.to_string();
105104
let args = &[
106105
"--eravm-assembly",
107106
crate::common::TEST_ERAVM_ASSEMBLY_CONTRACT_PATH,

‎era-compiler-solidity/tests/common/mod.rs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ pub fn read_sources(paths: &[&str]) -> BTreeMap<String, String> {
104104
pub fn build_solidity_standard_json(
105105
sources: BTreeMap<String, String>,
106106
libraries: era_compiler_common::Libraries,
107-
metadata_hash_type: era_compiler_common::EraVMMetadataHashType,
107+
metadata_hash_type: era_compiler_common::MetadataHashType,
108108
remappings: BTreeSet<String>,
109109
solc_version: &semver::Version,
110110
solc_codegen: era_solc::StandardJsonInputCodegen,
@@ -114,7 +114,7 @@ pub fn build_solidity_standard_json(
114114

115115
let solc_compiler = get_solc_compiler(solc_version)?;
116116

117-
era_compiler_llvm_context::initialize_target(era_compiler_common::Target::EraVM);
117+
era_compiler_llvm_context::initialize_target();
118118

119119
let sources: BTreeMap<String, era_solc::StandardJsonInputSource> = sources
120120
.into_iter()
@@ -180,14 +180,14 @@ pub fn build_solidity_combined_json(
180180
sources: BTreeMap<String, String>,
181181
libraries: era_compiler_common::Libraries,
182182
selectors: Vec<era_solc::CombinedJsonSelector>,
183-
metadata_hash_type: era_compiler_common::EraVMMetadataHashType,
183+
metadata_hash_type: era_compiler_common::MetadataHashType,
184184
solc_version: &semver::Version,
185185
solc_codegen: era_solc::StandardJsonInputCodegen,
186186
optimizer_settings: era_compiler_llvm_context::OptimizerSettings,
187187
) -> anyhow::Result<era_solc::CombinedJson> {
188188
self::setup()?;
189189

190-
era_compiler_llvm_context::initialize_target(era_compiler_common::Target::EraVM);
190+
era_compiler_llvm_context::initialize_target();
191191

192192
let solc_compiler = get_solc_compiler(solc_version)?;
193193
let paths: Vec<PathBuf> = sources.keys().map(PathBuf::from).collect();
@@ -245,7 +245,7 @@ pub fn build_solidity_and_detect_missing_libraries(
245245

246246
let solc_compiler = get_solc_compiler(solc_version)?;
247247

248-
era_compiler_llvm_context::initialize_target(era_compiler_common::Target::EraVM);
248+
era_compiler_llvm_context::initialize_target();
249249

250250
let sources: BTreeMap<String, era_solc::StandardJsonInputSource> = sources
251251
.into_iter()
@@ -296,7 +296,7 @@ pub fn build_yul(
296296
) -> anyhow::Result<era_solc::StandardJsonOutput> {
297297
self::setup()?;
298298

299-
era_compiler_llvm_context::initialize_target(era_compiler_common::Target::EraVM);
299+
era_compiler_llvm_context::initialize_target();
300300

301301
let optimizer_settings = era_compiler_llvm_context::OptimizerSettings::none();
302302

@@ -317,7 +317,7 @@ pub fn build_yul(
317317
let build = project.compile_to_eravm(
318318
&mut vec![],
319319
true,
320-
era_compiler_common::EraVMMetadataHashType::IPFS,
320+
era_compiler_common::MetadataHashType::IPFS,
321321
false,
322322
optimizer_settings,
323323
vec![],
@@ -345,7 +345,7 @@ pub fn build_yul_standard_json(
345345
) -> anyhow::Result<era_solc::StandardJsonOutput> {
346346
self::setup()?;
347347

348-
era_compiler_llvm_context::initialize_target(era_compiler_common::Target::EraVM);
348+
era_compiler_llvm_context::initialize_target();
349349

350350
let optimizer_settings = era_compiler_llvm_context::OptimizerSettings::try_from_cli(
351351
solc_input.settings.optimizer.mode,
@@ -373,7 +373,7 @@ pub fn build_yul_standard_json(
373373
let build = project.compile_to_eravm(
374374
&mut vec![],
375375
solc_compiler.is_none(),
376-
era_compiler_common::EraVMMetadataHashType::IPFS,
376+
era_compiler_common::MetadataHashType::IPFS,
377377
false,
378378
optimizer_settings,
379379
vec![],
@@ -398,7 +398,7 @@ pub fn build_llvm_ir_standard_json(
398398
) -> anyhow::Result<era_solc::StandardJsonOutput> {
399399
self::setup()?;
400400

401-
era_compiler_llvm_context::initialize_target(era_compiler_common::Target::EraVM);
401+
era_compiler_llvm_context::initialize_target();
402402

403403
let optimizer_settings =
404404
era_compiler_llvm_context::OptimizerSettings::try_from_cli(input.settings.optimizer.mode)?;
@@ -413,7 +413,7 @@ pub fn build_llvm_ir_standard_json(
413413
let build = project.compile_to_eravm(
414414
&mut vec![],
415415
true,
416-
era_compiler_common::EraVMMetadataHashType::IPFS,
416+
era_compiler_common::MetadataHashType::IPFS,
417417
false,
418418
optimizer_settings,
419419
vec![],
@@ -438,7 +438,7 @@ pub fn build_eravm_assembly_standard_json(
438438
) -> anyhow::Result<era_solc::StandardJsonOutput> {
439439
self::setup()?;
440440

441-
era_compiler_llvm_context::initialize_target(era_compiler_common::Target::EraVM);
441+
era_compiler_llvm_context::initialize_target();
442442

443443
let optimizer_settings =
444444
era_compiler_llvm_context::OptimizerSettings::try_from_cli(input.settings.optimizer.mode)?;
@@ -449,7 +449,7 @@ pub fn build_eravm_assembly_standard_json(
449449
let build = project.compile_to_eravm(
450450
&mut vec![],
451451
true,
452-
era_compiler_common::EraVMMetadataHashType::IPFS,
452+
era_compiler_common::MetadataHashType::IPFS,
453453
false,
454454
optimizer_settings,
455455
vec![],

0 commit comments

Comments
 (0)