grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bump ethabi & ethereum-types. (#8258)

Browse Source 
* Bump ethabi & ethereum-types.

* Fix test.

* Fix hex encodings.
This commit is contained in:
Tomasz Drwięga
2018-04-02 13:12:52 +02:00
committed by André Silva
parent c1cced3662
commit 9108a3bb50
66 changed files with 220 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
util/bloomchain/Cargo.toml
View File

@@ -8,7 +8,7 @@ license = "MIT"
keywords = ["ethereum", "ethcore", "bloom", "chain", "filter"]
[dependencies]
ethbloom = "0.4"
ethbloom = "0.5"
[dev-dependencies]
rustc-hex = "1.0"

2
util/dir/Cargo.toml
View File

@@ -4,6 +4,6 @@ version = "0.1.0"
authors = ["Parity Technologies <admin@parity.io>"]
[dependencies]
ethereum-types = "0.2"
ethereum-types = "0.3"
journaldb = { path = "../journaldb" }
app_dirs = "1.2.1"

2
util/dir/src/lib.rs
View File

@@ -156,7 +156,7 @@ impl DatabaseDirectories {
/// Base DB directory for the given fork.
// TODO: remove in 1.7
pub fn legacy_fork_path(&self) -> PathBuf {
Path::new(&self.legacy_path).join(format!("{:?}{}", H64::from(self.genesis_hash), self.fork_name.as_ref().map(|f| format!("-{}", f)).unwrap_or_default()))
Path::new(&self.legacy_path).join(format!("{:x}{}", H64::from(self.genesis_hash), self.fork_name.as_ref().map(|f| format!("-{}", f)).unwrap_or_default()))
}
/// Spec root directory for the given fork.

2
util/error/Cargo.toml
View File

@@ -6,6 +6,6 @@ authors = ["Parity Technologies <admin@parity.io>"]
[dependencies]
rlp = { path = "../rlp" }
kvdb = { path = "../kvdb" }
ethereum-types = "0.2"
ethereum-types = "0.3"
error-chain = { version = "0.11", default-features = false }
rustc-hex = "1.0"

2
util/hash/Cargo.toml
View File

@@ -8,7 +8,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
build = "build.rs"
[dependencies]
ethereum-types = "0.2"
ethereum-types = "0.3"
tiny-keccak = "1.3"
[build-dependencies]

2
util/hash/src/lib.rs
View File

@@ -105,6 +105,6 @@ mod tests {
let hash = keccak_buffer(&mut file).unwrap();
// then
assert_eq!(format!("{:?}", hash), "68371d7e884c168ae2022c82bd837d51837718a7f7dfb7aa3f753074a35e1d87");
assert_eq!(format!("{:x}", hash), "68371d7e884c168ae2022c82bd837d51837718a7f7dfb7aa3f753074a35e1d87");
}
}

2
util/hashdb/Cargo.toml
View File

@@ -7,4 +7,4 @@ license = "GPL-3.0"
[dependencies]
elastic-array = "0.10"
ethereum-types = "0.2"
ethereum-types = "0.3"

2
util/journaldb/Cargo.toml
View File

@@ -7,7 +7,7 @@ license = "GPL3"
[dependencies]
ethcore-bytes = { path = "../bytes" }
ethereum-types = "0.2"
ethereum-types = "0.3"
hashdb = { path = "../hashdb" }
heapsize = "0.4"
kvdb = { path = "../kvdb" }

2
util/kvdb-rocksdb/Cargo.toml
View File

@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
[dependencies]
elastic-array = "0.10"
ethereum-types = "0.2"
ethereum-types = "0.3"
kvdb = { path = "../kvdb" }
log = "0.3"
num_cpus = "1.0"

2
util/memorydb/Cargo.toml
View File

@@ -9,7 +9,7 @@ license = "GPL-3.0"
bigint = "4.0"
elastic-array = "0.10"
heapsize = "0.4"
ethereum-types = "0.2"
ethereum-types = "0.3"
keccak-hash = { version = "0.1.0", path = "../hash" }
hashdb = { version = "0.1.1", path = "../hashdb" }
plain_hasher = { path = "../plain_hasher" }

2
util/network-devp2p/Cargo.toml
View File

@@ -22,7 +22,7 @@ rustc-hex = "1.0"
ethcore-io = { path = "../io" }
ethcore-bytes = { path = "../bytes" }
ethcore-network = { path = "../network" }
ethereum-types = "0.2"
ethereum-types = "0.3"
ethkey = { path = "../../ethkey" }
ethcrypto = { path = "../../ethcrypto" }
rlp = { path = "../rlp" }

2
util/network-devp2p/src/host.rs
View File

@@ -1099,7 +1099,7 @@ fn save_key(path: &Path, key: &Secret) {
if let Err(e) = restrict_permissions_owner(path, true, false) {
warn!(target: "network", "Failed to modify permissions of the file ({})", e);
}
if let Err(e) = file.write(&key.hex().into_bytes()) {
if let Err(e) = file.write(&key.hex().into_bytes()[2..]) {
warn!("Error writing key file: {:?}", e);
}
}

4
util/network-devp2p/src/node_table.rs
View File

@@ -169,9 +169,9 @@ impl Node {
impl Display for Node {
fn fmt(&self, f: &mut Formatter) -> fmt::Result {
if self.endpoint.udp_port != self.endpoint.address.port() {
write!(f, "enode://{}@{}+{}", self.id.hex(), self.endpoint.address, self.endpoint.udp_port)?;
write!(f, "enode://{:x}@{}+{}", self.id, self.endpoint.address, self.endpoint.udp_port)?;
} else {
write!(f, "enode://{}@{}", self.id.hex(), self.endpoint.address)?;
write!(f, "enode://{:x}@{}", self.id, self.endpoint.address)?;
}
Ok(())
}

2
util/network/Cargo.toml
View File

@@ -8,7 +8,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
[dependencies]
ethcore-io = { path = "../io" }
ethereum-types = "0.2"
ethereum-types = "0.3"
ethkey = { path = "../../ethkey" }
ethcrypto = { path = "../../ethcrypto" }
rlp = { path = "../rlp" }

2
util/patricia_trie/Cargo.toml
View File

@@ -10,7 +10,7 @@ elastic-array = "0.10"
log = "0.3"
rand = "0.4"
ethcore-bytes = { version = "0.1.0", path = "../bytes" }
ethereum-types = "0.2"
ethereum-types = "0.3"
keccak-hash = { version = "0.1.0", path = "../hash" }
hashdb = { version = "0.1.1", path = "../hashdb" }
rlp = { version = "0.2.1", path = "../rlp" }

2
util/plain_hasher/Cargo.toml
View File

@@ -9,4 +9,4 @@ homepage = "https://github.com/paritytech/plain_hasher"
[dependencies]
crunchy = "0.1.6"
ethereum-types = "0.2"
ethereum-types = "0.3"

2
util/rlp/Cargo.toml
View File

@@ -8,6 +8,6 @@ authors = ["Parity Technologies <admin@parity.io>"]
[dependencies]
elastic-array = "0.10"
ethereum-types = "0.2"
ethereum-types = "0.3"
rustc-hex = "1.0"
byteorder = "1.0"

2
util/trie-standardmap/Cargo.toml
View File

@@ -6,6 +6,6 @@ description = "Standard test map for profiling tries"
[dependencies]
ethcore-bytes = { path = "../bytes" }
ethereum-types = "0.2"
ethereum-types = "0.3"
keccak-hash = { path = "../hash" }
rlp = { path = "../rlp" }

2
util/triehash/Cargo.toml
View File

@@ -8,7 +8,7 @@ license = "GPL-3.0"
[dependencies]
elastic-array = "0.10"
rlp = { version = "0.2.1", path = "../rlp" }
ethereum-types = "0.2"
ethereum-types = "0.3"
keccak-hash = { version = "0.1", path = "../hash" }
[dev-dependencies]