feat: use the new EthDisplay impls instead of manual parsing of events (#106)

* feat: use the new EthDisplay impls instead of manual parsing of events

* Revert "chore: use published ethers deps"

This reverts commit 6efb265.

* chore: update cargo lock

Author: gakonst

Cargo.lock

@@ -11,7 +11,8 @@ dapp-utils = { path = "./../utils" }
 dapp-solc = { path = "./../solc" }
 evm-adapters = { path = "./../evm-adapters", default-features = false }
 
-ethers = { version = "^0.5.0" }
+# ethers = { version = "0.5.2" }
+ethers = { git = "https://github.com/gakonst/ethers-rs", branch = "master" }
 svm = { package = "svm-rs", git = "https://github.com/roynalnaruto/svm-rs" }
 
 eyre = "0.6.5"

dapp/Cargo.toml

@@ -13,7 +13,8 @@ dapp-solc = { path = "../solc" }
 dapp = { path = "../dapp" }
 seth = { path = "../seth" }
 evm-adapters = { path = "../evm-adapters" }
-ethers = { version = "^0.5.0" }
+# ethers = "0.5"
+ethers = { git = "https://github.com/gakonst/ethers-rs", branch = "master" }
 ethers-etherscan = { git = "https://github.com/gakonst/ethers-rs", branch = "master" }
 eyre = "0.6.5"
 rustc-hex = "2.1.0"

dapptools/Cargo.toml

@@ -15,7 +15,8 @@ sputnik = { package = "evm", git = "https://github.com/rust-blockchain/evm",  op
 
 evmodin = { git = "https://github.com/vorot93/evmodin",  optional = true }
 
-ethers = { version = "^0.5.0" }
+# ethers = { version = "0.5.2" }
+ethers = { git = "https://github.com/gakonst/ethers-rs", branch = "master" }
 eyre = "0.6.5"
 once_cell = "1.8.0"
 tracing = "0.1.28"

evm-adapters/Cargo.toml

@@ -140,14 +140,6 @@ impl<'a, B: Backend> SputnikExecutor<CheatcodeStackState<'a, B>> for CheatcodeSt
             .map(|event| {
                 use HevmConsoleEvents::*;
                 match event {
-                    LogFilter(inner) => inner.0,
-                    LogsFilter(inner) => format!("0x{}", hex::encode(inner.0)),
-                    LogAddressFilter(inner) => format!("{:?}", inner.0),
-                    LogBytes32Filter(inner) => format!("0x{}", hex::encode(inner.0)),
-                    LogIntFilter(inner) => format!("{:?}", inner.0),
-                    LogUintFilter(inner) => format!("{:?}", inner.0),
-                    LogBytesFilter(inner) => format!("0x{}", hex::encode(inner.0)),
-                    LogStringFilter(inner) => inner.0,
                     LogNamedAddressFilter(inner) => format!("{}: {:?}", inner.key, inner.val),
                     LogNamedBytes32Filter(inner) => {
                         format!("{}: 0x{}", inner.key, hex::encode(inner.val))
@@ -170,6 +162,8 @@ impl<'a, B: Backend> SputnikExecutor<CheatcodeStackState<'a, B>> for CheatcodeSt
                         format!("{}: 0x{}", inner.key, hex::encode(inner.val))
                     }
                     LogNamedStringFilter(inner) => format!("{}: {}", inner.key, inner.val),
+
+                    e => e.to_string(),
                 }
             })
             .collect()

evm-adapters/src/sputnik/cheatcodes/cheatcode_handler.rs

@@ -8,8 +8,9 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 dapp-utils = { path = "../utils" }
-ethers-core = "^0.5.0"
-ethers-providers = { version = "^0.5.0", default-features = false }
+# ethers = "0.5"
+ethers-core = { git = "https://github.com/gakonst/ethers-rs", branch = "master", default-features = false }
+ethers-providers = { git = "https://github.com/gakonst/ethers-rs", branch = "master", default-features = false }
 eyre = "0.6.5"
 rustc-hex = "2.1.0"
 serde_json = "1.0.67"

seth/Cargo.toml

@@ -12,7 +12,8 @@ Incremental, parallel and multi-version Solidity compiler abstraction
 [dependencies]
 semver = "1.0.4"
 eyre = "0.6.5"
-ethers = { version = "^0.5.0" }
+# ethers = { version = "0.5.2" }
+ethers = { git = "https://github.com/gakonst/ethers-rs", branch = "master" }
 svm = { package = "svm-rs", git = "https://github.com/roynalnaruto/svm-rs" }
 tracing = "0.1.28"
 glob = "0.3.0"

solc/Cargo.toml

@@ -7,7 +7,8 @@ license = "MIT OR Apache-2.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ethers-core = "^0.5.0"
+# ethers = "0.5"
+ethers-core = { git = "https://github.com/gakonst/ethers-rs", branch = "master" }
 
 eyre = { version = "0.6.5", default-features = false }
 rustc-hex = { version = "2.1.0", default-features = false }