diff --git a/Cargo.lock b/Cargo.lock index 64bce91..13abb42 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1262,7 +1262,7 @@ dependencies = [ [[package]] name = "ethrex-blockchain" version = "7.0.0" -source = "git+https://github.com/lambdaclass/ethrex?tag=v7.0.0#f7cae770c6a8d78f355cb2f0afdcadfd75b14eba" +source = "git+https://github.com/lambdaclass/ethrex?branch=add_abi_option#33ac3c9fa2c3ed4bbbb6d436a89e9d90fd8957ac" dependencies = [ "bytes", "ethrex-common", @@ -1284,7 +1284,7 @@ dependencies = [ [[package]] name = "ethrex-common" version = "7.0.0" -source = "git+https://github.com/lambdaclass/ethrex?tag=v7.0.0#f7cae770c6a8d78f355cb2f0afdcadfd75b14eba" +source = "git+https://github.com/lambdaclass/ethrex?branch=add_abi_option#33ac3c9fa2c3ed4bbbb6d436a89e9d90fd8957ac" dependencies = [ "bytes", "crc32fast", @@ -1313,7 +1313,7 @@ dependencies = [ [[package]] name = "ethrex-crypto" version = "7.0.0" -source = "git+https://github.com/lambdaclass/ethrex?tag=v7.0.0#f7cae770c6a8d78f355cb2f0afdcadfd75b14eba" +source = "git+https://github.com/lambdaclass/ethrex?branch=add_abi_option#33ac3c9fa2c3ed4bbbb6d436a89e9d90fd8957ac" dependencies = [ "c-kzg", "kzg-rs", @@ -1324,7 +1324,7 @@ dependencies = [ [[package]] name = "ethrex-l2-common" version = "7.0.0" -source = "git+https://github.com/lambdaclass/ethrex?tag=v7.0.0#f7cae770c6a8d78f355cb2f0afdcadfd75b14eba" +source = "git+https://github.com/lambdaclass/ethrex?branch=add_abi_option#33ac3c9fa2c3ed4bbbb6d436a89e9d90fd8957ac" dependencies = [ "bytes", "ethereum-types", @@ -1346,7 +1346,7 @@ dependencies = [ [[package]] name = "ethrex-l2-rpc" version = "7.0.0" -source = "git+https://github.com/lambdaclass/ethrex?tag=v7.0.0#f7cae770c6a8d78f355cb2f0afdcadfd75b14eba" +source = "git+https://github.com/lambdaclass/ethrex?branch=add_abi_option#33ac3c9fa2c3ed4bbbb6d436a89e9d90fd8957ac" dependencies = [ "axum", "bytes", @@ -1376,7 +1376,7 @@ dependencies = [ [[package]] name = "ethrex-levm" version = "7.0.0" -source = "git+https://github.com/lambdaclass/ethrex?tag=v7.0.0#f7cae770c6a8d78f355cb2f0afdcadfd75b14eba" +source = "git+https://github.com/lambdaclass/ethrex?branch=add_abi_option#33ac3c9fa2c3ed4bbbb6d436a89e9d90fd8957ac" dependencies = [ "ark-bn254", "ark-ec", @@ -1408,7 +1408,7 @@ dependencies = [ [[package]] name = "ethrex-metrics" version = "7.0.0" -source = "git+https://github.com/lambdaclass/ethrex?tag=v7.0.0#f7cae770c6a8d78f355cb2f0afdcadfd75b14eba" +source = "git+https://github.com/lambdaclass/ethrex?branch=add_abi_option#33ac3c9fa2c3ed4bbbb6d436a89e9d90fd8957ac" dependencies = [ "axum", "ethrex-common", @@ -1424,7 +1424,7 @@ dependencies = [ [[package]] name = "ethrex-p2p" version = "7.0.0" -source = "git+https://github.com/lambdaclass/ethrex?tag=v7.0.0#f7cae770c6a8d78f355cb2f0afdcadfd75b14eba" +source = "git+https://github.com/lambdaclass/ethrex?branch=add_abi_option#33ac3c9fa2c3ed4bbbb6d436a89e9d90fd8957ac" dependencies = [ "aes", "async-trait", @@ -1466,7 +1466,7 @@ dependencies = [ [[package]] name = "ethrex-rlp" version = "7.0.0" -source = "git+https://github.com/lambdaclass/ethrex?tag=v7.0.0#f7cae770c6a8d78f355cb2f0afdcadfd75b14eba" +source = "git+https://github.com/lambdaclass/ethrex?branch=add_abi_option#33ac3c9fa2c3ed4bbbb6d436a89e9d90fd8957ac" dependencies = [ "bytes", "ethereum-types", @@ -1480,7 +1480,7 @@ dependencies = [ [[package]] name = "ethrex-rpc" version = "7.0.0" -source = "git+https://github.com/lambdaclass/ethrex?tag=v7.0.0#f7cae770c6a8d78f355cb2f0afdcadfd75b14eba" +source = "git+https://github.com/lambdaclass/ethrex?branch=add_abi_option#33ac3c9fa2c3ed4bbbb6d436a89e9d90fd8957ac" dependencies = [ "axum", "axum-extra", @@ -1519,7 +1519,7 @@ dependencies = [ [[package]] name = "ethrex-sdk" version = "7.0.0" -source = "git+https://github.com/lambdaclass/ethrex?tag=v7.0.0#f7cae770c6a8d78f355cb2f0afdcadfd75b14eba" +source = "git+https://github.com/lambdaclass/ethrex?branch=add_abi_option#33ac3c9fa2c3ed4bbbb6d436a89e9d90fd8957ac" dependencies = [ "bytes", "ethereum-types", @@ -1545,7 +1545,7 @@ dependencies = [ [[package]] name = "ethrex-sdk-contract-utils" version = "7.0.0" -source = "git+https://github.com/lambdaclass/ethrex?tag=v7.0.0#f7cae770c6a8d78f355cb2f0afdcadfd75b14eba" +source = "git+https://github.com/lambdaclass/ethrex?branch=add_abi_option#33ac3c9fa2c3ed4bbbb6d436a89e9d90fd8957ac" dependencies = [ "thiserror 2.0.17", "tracing", @@ -1554,7 +1554,7 @@ dependencies = [ [[package]] name = "ethrex-storage" version = "7.0.0" -source = "git+https://github.com/lambdaclass/ethrex?tag=v7.0.0#f7cae770c6a8d78f355cb2f0afdcadfd75b14eba" +source = "git+https://github.com/lambdaclass/ethrex?branch=add_abi_option#33ac3c9fa2c3ed4bbbb6d436a89e9d90fd8957ac" dependencies = [ "anyhow", "async-trait", @@ -1578,7 +1578,7 @@ dependencies = [ [[package]] name = "ethrex-storage-rollup" version = "7.0.0" -source = "git+https://github.com/lambdaclass/ethrex?tag=v7.0.0#f7cae770c6a8d78f355cb2f0afdcadfd75b14eba" +source = "git+https://github.com/lambdaclass/ethrex?branch=add_abi_option#33ac3c9fa2c3ed4bbbb6d436a89e9d90fd8957ac" dependencies = [ "anyhow", "async-trait", @@ -1598,7 +1598,7 @@ dependencies = [ [[package]] name = "ethrex-threadpool" version = "0.1.0" -source = "git+https://github.com/lambdaclass/ethrex?tag=v7.0.0#f7cae770c6a8d78f355cb2f0afdcadfd75b14eba" +source = "git+https://github.com/lambdaclass/ethrex?branch=add_abi_option#33ac3c9fa2c3ed4bbbb6d436a89e9d90fd8957ac" dependencies = [ "crossbeam 0.8.4", ] @@ -1606,7 +1606,7 @@ dependencies = [ [[package]] name = "ethrex-trie" version = "7.0.0" -source = "git+https://github.com/lambdaclass/ethrex?tag=v7.0.0#f7cae770c6a8d78f355cb2f0afdcadfd75b14eba" +source = "git+https://github.com/lambdaclass/ethrex?branch=add_abi_option#33ac3c9fa2c3ed4bbbb6d436a89e9d90fd8957ac" dependencies = [ "anyhow", "bytes", @@ -1618,6 +1618,7 @@ dependencies = [ "ethrex-threadpool", "hex", "lazy_static", + "rkyv", "rustc-hash", "serde", "serde_json", @@ -1629,7 +1630,7 @@ dependencies = [ [[package]] name = "ethrex-vm" version = "7.0.0" -source = "git+https://github.com/lambdaclass/ethrex?tag=v7.0.0#f7cae770c6a8d78f355cb2f0afdcadfd75b14eba" +source = "git+https://github.com/lambdaclass/ethrex?branch=add_abi_option#33ac3c9fa2c3ed4bbbb6d436a89e9d90fd8957ac" dependencies = [ "bincode", "bytes", @@ -3645,7 +3646,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.4.15", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index d8996ed..ba269cb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,13 +29,13 @@ manual_saturating_arithmetic = "warn" rex-cli = { path = "cli" } rex-sdk = { path = "sdk" } -ethrex-common = { git = "https://github.com/lambdaclass/ethrex", package = "ethrex-common", tag = "v7.0.0" } -ethrex-blockchain = { git = "https://github.com/lambdaclass/ethrex", package = "ethrex-blockchain", tag = "v7.0.0" } -ethrex-rlp = { git = "https://github.com/lambdaclass/ethrex", package = "ethrex-rlp", tag = "v7.0.0" } -ethrex-rpc = { git = "https://github.com/lambdaclass/ethrex", package = "ethrex-rpc", tag = "v7.0.0" } -ethrex-l2-rpc = { git = "https://github.com/lambdaclass/ethrex", package = "ethrex-l2-rpc", tag = "v7.0.0" } -ethrex-sdk = { git = "https://github.com/lambdaclass/ethrex", package = "ethrex-sdk", tag = "v7.0.0" } -ethrex-l2-common = { git = "https://github.com/lambdaclass/ethrex", package = "ethrex-l2-common", tag = "v7.0.0" } +ethrex-common = { git = "https://github.com/lambdaclass/ethrex", package = "ethrex-common", branch = "add_abi_option" } +ethrex-blockchain = { git = "https://github.com/lambdaclass/ethrex", package = "ethrex-blockchain", branch = "add_abi_option" } +ethrex-rlp = { git = "https://github.com/lambdaclass/ethrex", package = "ethrex-rlp", branch = "add_abi_option" } +ethrex-rpc = { git = "https://github.com/lambdaclass/ethrex", package = "ethrex-rpc", branch = "add_abi_option" } +ethrex-l2-rpc = { git = "https://github.com/lambdaclass/ethrex", package = "ethrex-l2-rpc", branch = "add_abi_option" } +ethrex-sdk = { git = "https://github.com/lambdaclass/ethrex", package = "ethrex-sdk", branch = "add_abi_option" } +ethrex-l2-common = { git = "https://github.com/lambdaclass/ethrex", package = "ethrex-l2-common", branch = "add_abi_option" } keccak-hash = "0.11.0" thiserror = "2.0.11" diff --git a/Makefile b/Makefile index 610e390..799506b 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,14 @@ .PHONY: cli -cli: +cli: update-ethrex cargo install --path cli --locked + +update-ethrex: + cargo update \ + -p ethrex-common \ + -p ethrex-blockchain \ + -p ethrex-rlp \ + -p ethrex-rpc \ + -p ethrex-l2-rpc \ + -p ethrex-sdk \ + -p ethrex-l2-common diff --git a/cli/src/cli.rs b/cli/src/cli.rs index 434d564..c6861a3 100644 --- a/cli/src/cli.rs +++ b/cli/src/cli.rs @@ -770,6 +770,7 @@ async fn compile_contract_from_path(args: DeployArgs) -> eyre::Result { output_dir, contract_path, false, + true, Some(&solc_remappings_ref), &include_paths, )