chore: use latest ethabi (#253)

* chore: use latest ethabi

* chore: use re-exported ethereum types
This commit is contained in:
Georgios Konstantopoulos 2021-04-01 20:02:34 +03:00 committed by GitHub
parent bc80b7d327
commit 5eb31ceae9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 10 deletions

6
Cargo.lock generated
View File

@ -573,8 +573,9 @@ dependencies = [
[[package]] [[package]]
name = "ethabi" name = "ethabi"
version = "13.0.0" version = "14.0.0"
source = "git+https://github.com/rust-ethereum/ethabi#a9126613ecd18295f48fa3222eabdc4b65c07392" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c52991643379afc90bfe2df3c64d53983e59c35a82ba6e75c997cfc2880d8524"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"ethereum-types", "ethereum-types",
@ -689,7 +690,6 @@ dependencies = [
"ecdsa", "ecdsa",
"elliptic-curve 0.9.5", "elliptic-curve 0.9.5",
"ethabi", "ethabi",
"ethereum-types",
"ethers", "ethers",
"funty", "funty",
"futures-util", "futures-util",

View File

@ -10,10 +10,8 @@ repository = "https://github.com/gakonst/ethers-rs"
keywords = ["ethereum", "web3", "celo", "ethers"] keywords = ["ethereum", "web3", "celo", "ethers"]
[dependencies] [dependencies]
# ethereum related
ethereum-types = { version = "0.11.0", default-features = false }
rlp = { version = "0.5.0", default-features = false } rlp = { version = "0.5.0", default-features = false }
ethabi = { git = "https://github.com/rust-ethereum/ethabi", version = "13.0.0", default-features = false } ethabi = { version = "14.0.0", default-features = false }
arrayvec = { version = "0.5.1", default-features = false } arrayvec = { version = "0.5.1", default-features = false }
# crypto # crypto

View File

@ -3,7 +3,7 @@
use crate::abi::{InvalidOutputType, Token, Tokenizable}; use crate::abi::{InvalidOutputType, Token, Tokenizable};
use crate::types::U256; use crate::types::U256;
use ethereum_types::FromDecStrErr; use ethabi::ethereum_types::FromDecStrErr;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::cmp; use std::cmp;
use std::convert::{TryFrom, TryInto}; use std::convert::{TryFrom, TryInto};

View File

@ -3,9 +3,9 @@ pub type Selector = [u8; 4];
// Re-export common ethereum datatypes with more specific names // Re-export common ethereum datatypes with more specific names
/// A transaction Hash /// A transaction Hash
pub use ethereum_types::H256 as TxHash; pub use ethabi::ethereum_types::H256 as TxHash;
pub use ethereum_types::{Address, Bloom, H160, H256, U128, U256, U64}; pub use ethabi::ethereum_types::{Address, Bloom, H160, H256, U128, U256, U64};
mod transaction; mod transaction;
pub use transaction::{Transaction, TransactionReceipt, TransactionRequest}; pub use transaction::{Transaction, TransactionReceipt, TransactionRequest};

View File

@ -1,5 +1,5 @@
//! Various utilities for manipulating Ethereum related dat //! Various utilities for manipulating Ethereum related dat
use ethereum_types::H256; use ethabi::ethereum_types::H256;
use tiny_keccak::{Hasher, Keccak}; use tiny_keccak::{Hasher, Keccak};
const PREFIX: &str = "\x19Ethereum Signed Message:\n"; const PREFIX: &str = "\x19Ethereum Signed Message:\n";