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

patch beta release pipeline (#10020)

Browse Source 
* version: bump beta to 2.2.4

* ci: move future releases to ethereum subdir on s3 (#10017)

* ci: move future releases to ethereum subdir on s3

* ci: redesign s3 bucket logic

* ci: use the releases bucket

* Handle failing case for update account cache in require (#9989)

* state: remove accidently merged test

* state: remove merge leftovers
This commit is contained in:
Afri Schoedon 2018-12-05 16:07:11 +01:00 committed by GitHub
parent 6b0a280685
commit f44d885b6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 41 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Cargo.lock generated
View File

@ -2162,7 +2162,7 @@ version = "1.12.0"
dependencies = [ dependencies = [
"jni 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "jni 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
"panic_hook 0.1.0", "panic_hook 0.1.0",
"parity-ethereum 2.2.3", "parity-ethereum 2.2.4",
] ]
[[package]] [[package]]
@ -2178,7 +2178,7 @@ dependencies = [
[[package]] [[package]]
name = "parity-ethereum" name = "parity-ethereum"
version = "2.2.3" version = "2.2.4"
dependencies = [ dependencies = [
"ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
"atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2227,7 +2227,7 @@ dependencies = [
"parity-rpc-client 1.4.0", "parity-rpc-client 1.4.0",
"parity-runtime 0.1.0", "parity-runtime 0.1.0",
"parity-updater 1.12.0", "parity-updater 1.12.0",
"parity-version 2.2.3", "parity-version 2.2.4",
"parity-whisper 0.1.0", "parity-whisper 0.1.0",
"parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
"pretty_assertions 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "pretty_assertions 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2382,7 +2382,7 @@ dependencies = [
"parity-crypto 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "parity-crypto 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-runtime 0.1.0", "parity-runtime 0.1.0",
"parity-updater 1.12.0", "parity-updater 1.12.0",
"parity-version 2.2.3", "parity-version 2.2.4",
"parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
"patricia-trie 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "patricia-trie 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"pretty_assertions 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "pretty_assertions 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2479,7 +2479,7 @@ dependencies = [
"parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-hash-fetch 1.12.0", "parity-hash-fetch 1.12.0",
"parity-path 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-path 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-version 2.2.3", "parity-version 2.2.4",
"parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
"semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2489,7 +2489,7 @@ dependencies = [
[[package]] [[package]]
name = "parity-version" name = "parity-version"
version = "2.2.3" version = "2.2.4"
dependencies = [ dependencies = [
"parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rlp 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "rlp 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",

2
Cargo.toml
View File

@ -2,7 +2,7 @@
description = "Parity Ethereum client" description = "Parity Ethereum client"
name = "parity-ethereum" name = "parity-ethereum"
# NOTE Make sure to update util/version/Cargo.toml as well # NOTE Make sure to update util/version/Cargo.toml as well
version = "2.2.3" version = "2.2.4"
license = "GPL-3.0" license = "GPL-3.0"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]

63
ethcore/src/state/mod.rs
View File

@ -1136,7 +1136,7 @@ impl<B: Backend> State<B> {
self.note_cache(a); self.note_cache(a);
// at this point the entry is guaranteed to be in the cache. // at this point the entry is guaranteed to be in the cache.
Ok(RefMut::map(self.cache.borrow_mut(), |c| { let mut account = RefMut::map(self.cache.borrow_mut(), |c| {
let entry = c.get_mut(a).expect("entry known to exist in the cache; qed"); let entry = c.get_mut(a).expect("entry known to exist in the cache; qed");
match &mut entry.account { match &mut entry.account {
@ -1146,18 +1146,19 @@ impl<B: Backend> State<B> {
// set the dirty flag after changing account data. // set the dirty flag after changing account data.
entry.state = AccountState::Dirty; entry.state = AccountState::Dirty;
match entry.account { entry.account.as_mut().expect("Required account must always exist; qed")
Some(ref mut account) => { });
if require_code {
let addr_hash = account.address_hash(a); if require_code {
let accountdb = self.factories.accountdb.readonly(self.db.as_hashdb(), addr_hash); let addr_hash = account.address_hash(a);
Self::update_account_cache(RequireCache::Code, account, &self.db, accountdb.as_hashdb()); let accountdb = self.factories.accountdb.readonly(self.db.as_hashdb(), addr_hash);
}
account if !Self::update_account_cache(RequireCache::Code, &mut account, &self.db, accountdb.as_hashdb()) {
}, return Err(Box::new(TrieError::IncompleteDatabase(H256::from(a))))
_ => panic!("Required account must always exist; qed"),
} }
})) }
Ok(account)
} }
/// Replace account code and storage. Creates account if it does not exist. /// Replace account code and storage. Creates account if it does not exist.
@ -2591,12 +2592,12 @@ mod tests {
assert_eq!(diff_map.len(), 1); assert_eq!(diff_map.len(), 1);
assert!(diff_map.get(&a).is_some()); assert!(diff_map.get(&a).is_some());
assert_eq!(diff_map.get(&a), assert_eq!(diff_map.get(&a),
pod_account::diff_pod(Some(&PodAccount { pod_account::diff_pod(Some(&PodAccount {
balance: U256::from(100), balance: U256::from(100),
nonce: U256::zero(), nonce: U256::zero(),
code: Some(Default::default()), code: Some(Default::default()),
storage: Default::default() storage: Default::default()
}), None).as_ref()); }), None).as_ref());
} }
#[test] #[test]
@ -2622,18 +2623,18 @@ mod tests {
assert_eq!(diff_map.len(), 1); assert_eq!(diff_map.len(), 1);
assert!(diff_map.get(&a).is_some()); assert!(diff_map.get(&a).is_some());
assert_eq!(diff_map.get(&a), assert_eq!(diff_map.get(&a),
pod_account::diff_pod(Some(&PodAccount { pod_account::diff_pod(Some(&PodAccount {
balance: U256::zero(), balance: U256::zero(),
nonce: U256::zero(), nonce: U256::zero(),
code: Some(Default::default()), code: Some(Default::default()),
storage: vec![(H256::from(&U256::from(1u64)), H256::from(&U256::from(20u64)))] storage: vec![(H256::from(&U256::from(1u64)), H256::from(&U256::from(20u64)))]
.into_iter().collect(), .into_iter().collect(),
}), Some(&PodAccount { }), Some(&PodAccount {
balance: U256::zero(), balance: U256::zero(),
nonce: U256::zero(), nonce: U256::zero(),
code: Some(Default::default()), code: Some(Default::default()),
storage: vec![(H256::from(&U256::from(1u64)), H256::from(&U256::from(100u64)))] storage: vec![(H256::from(&U256::from(1u64)), H256::from(&U256::from(100u64)))]
.into_iter().collect(), .into_iter().collect(),
})).as_ref()); })).as_ref());
} }
} }

2
scripts/gitlab/publish-awss3.sh
View File

@ -43,7 +43,7 @@ aws configure set aws_secret_access_key $s3_secret
case "${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}" in case "${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}" in
(beta|stable|nightly) (beta|stable|nightly)
export S3_BUCKET=builds-parity-published; export S3_BUCKET=releases.parity.io/ethereum;
;; ;;
(*) (*)
export S3_BUCKET=builds-parity; export S3_BUCKET=builds-parity;

2
util/version/Cargo.toml
View File

@ -3,7 +3,7 @@
[package] [package]
name = "parity-version" name = "parity-version"
# NOTE: this value is used for Parity Ethereum version string (via env CARGO_PKG_VERSION) # NOTE: this value is used for Parity Ethereum version string (via env CARGO_PKG_VERSION)
version = "2.2.3" version = "2.2.4"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
build = "build.rs" build = "build.rs"