diff --git a/Cargo.lock b/Cargo.lock index 239fbb0..d1c9fe3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1977,6 +1977,112 @@ dependencies = [ "triedb", ] +[[package]] +name = "exzo-account-program" +version = "0.0.1" +dependencies = [ + "base64 0.13.0", + "borsh", + "borsh-derive", + "serde", + "solana-sdk", +] + +[[package]] +name = "exzo-install" +version = "1.9.29" +dependencies = [ + "atty", + "bincode", + "binstall-tar", + "bzip2", + "chrono", + "clap 2.34.0", + "console 0.11.3", + "ctrlc", + "dirs-next", + "indicatif 0.15.0", + "lazy_static", + "nix 0.23.1", + "reqwest", + "semver 1.0.13", + "serde", + "serde_json", + "serde_yaml", + "solana-clap-utils", + "solana-client", + "solana-config-program", + "solana-logger 1.9.29", + "solana-sdk", + "solana-version", + "tempfile", + "url 2.2.2", + "winapi 0.3.9", + "winreg 0.7.0", +] + +[[package]] +name = "exzo-relying-party-program" +version = "0.0.1" +dependencies = [ + "borsh", + "borsh-derive", + "serde", + "serde_with", + "solana-program 1.9.29", +] + +[[package]] +name = "exzo-validator" +version = "1.9.29" +dependencies = [ + "chrono", + "clap 2.34.0", + "console 0.15.1", + "core_affinity", + "evm-state", + "fd-lock", + "indicatif 0.16.2", + "jsonrpc-core", + "jsonrpc-core-client", + "jsonrpc-derive", + "jsonrpc-ipc-server", + "jsonrpc-server-utils 18.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc", + "log 0.4.17", + "num_cpus", + "rand 0.7.3", + "signal-hook", + "solana-clap-utils", + "solana-cli-config", + "solana-client", + "solana-core", + "solana-download-utils", + "solana-entry", + "solana-faucet", + "solana-genesis-utils", + "solana-gossip", + "solana-ledger", + "solana-logger 1.9.29", + "solana-metrics", + "solana-net-utils", + "solana-perf", + "solana-poh", + "solana-replica-lib", + "solana-rpc", + "solana-runtime", + "solana-sdk", + "solana-send-transaction-service", + "solana-streamer", + "solana-test-validator", + "solana-version", + "solana-vote-program", + "symlink", + "sysctl", + "tempfile", + "tikv-jemallocator", +] + [[package]] name = "failure" version = "0.1.8" @@ -4983,9 +5089,9 @@ dependencies = [ [[package]] name = "rlp" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "999508abb0ae792aabed2460c45b89106d97fe4adac593bdaef433c2605847b5" +checksum = "bb919243f34364b6bd2fc10ef797edbfa75f33c252e7998527479c6d6b47e1ec" dependencies = [ "bytes 1.2.1", "rustc-hex", @@ -5715,6 +5821,8 @@ dependencies = [ "bincode", "bs58", "bv", + "exzo-account-program", + "exzo-relying-party-program", "lazy_static", "serde", "serde_derive", @@ -5724,8 +5832,6 @@ dependencies = [ "solana-vote-program", "spl-token", "thiserror", - "exzo-account-program", - "exzo-relying-party-program", "zstd", ] @@ -6205,6 +6311,8 @@ dependencies = [ "etcd-client", "evm-rpc", "evm-state", + "exzo-account-program", + "exzo-relying-party-program", "fs_extra", "hex", "histogram", @@ -6266,8 +6374,6 @@ dependencies = [ "thiserror", "tokio", "trees", - "exzo-account-program", - "exzo-relying-party-program", ] [[package]] @@ -7071,6 +7177,7 @@ version = "1.9.29" dependencies = [ "clap 2.34.0", "crossbeam-channel", + "exzo-validator", "log 0.4.17", "rand 0.7.3", "serial_test 0.5.1", @@ -7092,7 +7199,6 @@ dependencies = [ "solana-version", "tempfile", "tonic-build 0.8.0", - "exzo-validator", ] [[package]] @@ -7106,6 +7212,8 @@ dependencies = [ "dashmap 4.0.2", "evm-rpc", "evm-state", + "exzo-account-program", + "exzo-relying-party-program", "itertools", "jsonrpc-core", "jsonrpc-core-client", @@ -7158,8 +7266,6 @@ dependencies = [ "tracing-attributes", "tracing-opentelemetry 0.16.0", "tracing-subscriber 0.3.15", - "exzo-account-program", - "exzo-relying-party-program", ] [[package]] @@ -7208,6 +7314,8 @@ dependencies = [ "ed25519-dalek", "evm-rpc", "evm-state", + "exzo-account-program", + "exzo-relying-party-program", "flate2", "fnv", "index_list", @@ -7247,8 +7355,6 @@ dependencies = [ "tar", "tempfile", "thiserror", - "exzo-account-program", - "exzo-relying-party-program", "walkdir", "zstd", ] @@ -9008,112 +9114,6 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" -[[package]] -name = "exzo-account-program" -version = "0.0.1" -dependencies = [ - "base64 0.13.0", - "borsh", - "borsh-derive", - "serde", - "solana-sdk", -] - -[[package]] -name = "exzo-install" -version = "1.9.29" -dependencies = [ - "atty", - "bincode", - "binstall-tar", - "bzip2", - "chrono", - "clap 2.34.0", - "console 0.11.3", - "ctrlc", - "dirs-next", - "indicatif 0.15.0", - "lazy_static", - "nix 0.23.1", - "reqwest", - "semver 1.0.13", - "serde", - "serde_json", - "serde_yaml", - "solana-clap-utils", - "solana-client", - "solana-config-program", - "solana-logger 1.9.29", - "solana-sdk", - "solana-version", - "tempfile", - "url 2.2.2", - "winapi 0.3.9", - "winreg 0.7.0", -] - -[[package]] -name = "exzo-relying-party-program" -version = "0.0.1" -dependencies = [ - "borsh", - "borsh-derive", - "serde", - "serde_with", - "solana-program 1.9.29", -] - -[[package]] -name = "exzo-validator" -version = "1.9.29" -dependencies = [ - "chrono", - "clap 2.34.0", - "console 0.15.1", - "core_affinity", - "evm-state", - "fd-lock", - "indicatif 0.16.2", - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", - "jsonrpc-ipc-server", - "jsonrpc-server-utils 18.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc", - "log 0.4.17", - "num_cpus", - "rand 0.7.3", - "signal-hook", - "solana-clap-utils", - "solana-cli-config", - "solana-client", - "solana-core", - "solana-download-utils", - "solana-entry", - "solana-faucet", - "solana-genesis-utils", - "solana-gossip", - "solana-ledger", - "solana-logger 1.9.29", - "solana-metrics", - "solana-net-utils", - "solana-perf", - "solana-poh", - "solana-replica-lib", - "solana-rpc", - "solana-runtime", - "solana-sdk", - "solana-send-transaction-service", - "solana-streamer", - "solana-test-validator", - "solana-version", - "solana-vote-program", - "symlink", - "sysctl", - "tempfile", - "tikv-jemallocator", -] - [[package]] name = "version_check" version = "0.1.5" diff --git a/evm-utils/evm-rpc/Cargo.toml b/evm-utils/evm-rpc/Cargo.toml index d4c6c4b..927a915 100644 --- a/evm-utils/evm-rpc/Cargo.toml +++ b/evm-utils/evm-rpc/Cargo.toml @@ -18,7 +18,7 @@ primitive-types = "0.11.0" evm-state = { path = "../evm-state" } hex = "0.4.2" rustc-hex = "2.1" -rlp = "0.5.0" +rlp = "0.5.2" secp256k1 = { version = "0.19.0", features = ["recovery", "global-context"] } snafu = "0.7" uint = "0.9" diff --git a/evm-utils/evm-state/Cargo.toml b/evm-utils/evm-state/Cargo.toml index b8ddd38..14289fa 100644 --- a/evm-utils/evm-state/Cargo.toml +++ b/evm-utils/evm-state/Cargo.toml @@ -22,7 +22,7 @@ hex = "0.4.2" serde = "1.0" sha3 = "0.9.1" rand = "0.8.3" -rlp = "0.5.0" +rlp = "0.5.2" thiserror = "1.0.22" anyhow = "1.0.34" bincode = "1.3.1" diff --git a/ledger-tool/Cargo.toml b/ledger-tool/Cargo.toml index cf87519..20fb594 100644 --- a/ledger-tool/Cargo.toml +++ b/ledger-tool/Cargo.toml @@ -42,7 +42,7 @@ evm-state = { path = "../evm-utils/evm-state" } evm-rpc = { path = "../evm-utils/evm-rpc" } solana-evm-loader-program = { path = "../evm-utils/programs/evm_loader" } triedb = { git = "https://github.com/velas/triedb", tag = "rocksdb-v0.19", features = ["rocksdb"] } -rlp = "0.5.0" +rlp = "0.5.2" anyhow = "1.0.43" rayon = "1.5.0" [target.'cfg(not(target_env = "msvc"))'.dependencies] diff --git a/storage-proto/Cargo.toml b/storage-proto/Cargo.toml index 9dd5f93..4936c51 100644 --- a/storage-proto/Cargo.toml +++ b/storage-proto/Cargo.toml @@ -18,7 +18,7 @@ solana-account-decoder = { path = "../account-decoder", version = "=1.9.29" } solana-sdk = { path = "../sdk", version = "=1.9.29" } solana-transaction-status = { path = "../transaction-status", version = "=1.9.29" } -rlp = "0.5.0" +rlp = "0.5.2" evm-state = { path = "../evm-utils/evm-state" } [dev-dependencies] enum-iterator = "0.7.0"