ethereum: Rebase web3, use upstream ethabi

This is a rebase of #2362

Author: leoyvens

Cargo.lock

@@ -6,8 +6,8 @@ edition = "2018"
 [dependencies]
 chrono = "0.4"
 futures = "0.1.21"
-http = "0.1.21" # must be compatible with the version rust-web3 uses
-jsonrpc-core = "14.2.0"
+http = "0.2.4"
+jsonrpc-core = "17.0.0"
 graph = { path = "../../graph" }
 lazy_static = "1.2.0"
 mockall = "0.9.1"
@@ -21,15 +21,6 @@ tiny-keccak = "1.5.0"
 hex = "0.4.3"
 semver = "1.0.3"
 
-# master contains changes such as
-# https://github.com/paritytech/ethabi/pull/140, which upstream does not want
-# and we should try to implement on top of ethabi instead of inside it, and
-# tuple support which isn't upstreamed yet. For now, we shall deviate from
-# ethabi, but long term we want to find a way to drop our fork.
-ethabi = { git = "https://github.com/graphprotocol/ethabi.git", branch = "master" }
-
-# We have a couple custom patches to web3.
-web3 = { git = "https://github.com/graphprotocol/rust-web3", branch = "master" }
 itertools = "0.10.0"
 
 graph-runtime-wasm = { path = "../../runtime/wasm" }

chain/ethereum/Cargo.toml

@@ -672,8 +672,8 @@ mod tests {
     use super::EthereumCallFilter;
 
     use graph::prelude::web3::types::Address;
+    use graph::prelude::web3::types::Bytes;
     use graph::prelude::EthereumCall;
-    use web3::types::Bytes;
 
     use std::collections::{HashMap, HashSet};
     use std::iter::FromIterator;

chain/ethereum/src/adapter.rs

@@ -2,11 +2,12 @@
 mod pbcodec;
 
 use graph::prelude::{
-    web3::types::TransactionReceipt as w3TransactionReceipt, EthereumBlock, EthereumBlockWithCalls,
-    EthereumCall, LightEthereumBlock,
+    web3,
+    web3::types::TransactionReceipt as w3TransactionReceipt,
+    web3::types::{Bytes, H160, H2048, H256, H64, U256, U64},
+    EthereumBlock, EthereumBlockWithCalls, EthereumCall, LightEthereumBlock,
 };
 use std::sync::Arc;
-use web3::types::{Bytes, H160, H2048, H256, H64, U256, U64};
 
 use crate::chain::BlockFinality;
 
@@ -156,7 +157,7 @@ impl<'a> Into<web3::types::Transaction> for TransactionTraceAt<'a> {
             block_hash: Some(H256::from_slice(&self.block.hash)),
             block_number: Some(U64::from(self.block.number)),
             transaction_index: Some(U64::from(self.trace.index as u64)),
-            from: H160::from_slice(&self.trace.from),
+            from: Some(H160::from_slice(&self.trace.from)),
             to: Some(H160::from_slice(&self.trace.to)),
             value: self
                 .trace
@@ -170,6 +171,10 @@ impl<'a> Into<web3::types::Transaction> for TransactionTraceAt<'a> {
                 .map_or_else(|| U256::from(0), |x| x.into()),
             gas: U256::from(self.trace.gas_used),
             input: Bytes::from(self.trace.input.clone()),
+            v: None,
+            r: None,
+            s: None,
+            raw: None,
         }
     }
 }

chain/ethereum/src/codec.rs

@@ -1,8 +1,8 @@
 use anyhow::{anyhow, Error};
 use anyhow::{ensure, Context};
-use ethabi::{Address, Contract, Event, Function, LogParam, ParamType, RawLog};
 use graph::blockchain::TriggerWithHandler;
 use graph::components::store::StoredDynamicDataSource;
+use graph::prelude::ethabi::StateMutability;
 use graph::prelude::futures03::future::try_join;
 use graph::prelude::futures03::stream::FuturesOrdered;
 use graph::prelude::{Entity, Link, SubgraphManifestValidationError};
@@ -11,14 +11,16 @@ use std::collections::BTreeMap;
 use std::str::FromStr;
 use std::{convert::TryFrom, sync::Arc};
 use tiny_keccak::{keccak256, Keccak};
-use web3::types::{Log, Transaction, H256};
 
 use graph::{
     blockchain::{self, Blockchain},
     prelude::{
-        async_trait, info, serde_json, BlockNumber, CheapClone, DataSourceTemplateInfo,
-        Deserialize, EthereumCall, LightEthereumBlock, LightEthereumBlockExt, LinkResolver, Logger,
-        TryStreamExt,
+        async_trait,
+        ethabi::{Address, Contract, Event, Function, LogParam, ParamType, RawLog},
+        info, serde_json,
+        web3::types::{Log, Transaction, H256},
+        BlockNumber, CheapClone, DataSourceTemplateInfo, Deserialize, EthereumCall,
+        LightEthereumBlock, LightEthereumBlockExt, LinkResolver, Logger, TryStreamExt,
     },
 };
 
@@ -399,8 +401,8 @@ impl DataSource {
             .contract
             .functions()
             .filter(|function| match function.state_mutability {
-                ethabi::StateMutability::Payable | ethabi::StateMutability::NonPayable => true,
-                ethabi::StateMutability::Pure | ethabi::StateMutability::View => false,
+                StateMutability::Payable | StateMutability::NonPayable => true,
+                StateMutability::Pure | StateMutability::View => false,
             })
             .find(|function| {
                 // Construct the argument function signature: