Skip to content
This repository has been archived by the owner on Oct 19, 2024. It is now read-only.

chore: use latest ethabi #253

Merged
merged 2 commits into from
Apr 1, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions ethers-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@ repository = "https://github.com/gakonst/ethers-rs"
keywords = ["ethereum", "web3", "celo", "ethers"]

[dependencies]
# ethereum related
ethereum-types = { version = "0.11.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 }

# crypto
Expand Down
2 changes: 1 addition & 1 deletion ethers-core/src/types/i256.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

use crate::abi::{InvalidOutputType, Token, Tokenizable};
use crate::types::U256;
use ethereum_types::FromDecStrErr;
use ethabi::ethereum_types::FromDecStrErr;
use serde::{Deserialize, Serialize};
use std::cmp;
use std::convert::{TryFrom, TryInto};
Expand Down
4 changes: 2 additions & 2 deletions ethers-core/src/types/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ pub type Selector = [u8; 4];
// Re-export common ethereum datatypes with more specific names

/// 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;
pub use transaction::{Transaction, TransactionReceipt, TransactionRequest};
Expand Down
2 changes: 1 addition & 1 deletion ethers-core/src/utils/hash.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//! Various utilities for manipulating Ethereum related dat
use ethereum_types::H256;
use ethabi::ethereum_types::H256;
use tiny_keccak::{Hasher, Keccak};

const PREFIX: &str = "\x19Ethereum Signed Message:\n";
Expand Down