From 63fdad8d86f3e7191a047121ee0d03caefcb131f Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 2 Mar 2021 21:27:28 +0800 Subject: [PATCH 1/6] ethcore/snapshot: fix double-lock in Service::feed_chunk (#289) --- crates/ethcore/src/snapshot/service.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/ethcore/src/snapshot/service.rs b/crates/ethcore/src/snapshot/service.rs index b94d36199..556e0609e 100644 --- a/crates/ethcore/src/snapshot/service.rs +++ b/crates/ethcore/src/snapshot/service.rs @@ -766,7 +766,7 @@ impl Service { | Err(Error(SnapshotErrorKind::Snapshot(SnapshotError::RestorationAborted), _)) => (), Err(e) => { warn!("Encountered error during snapshot restoration: {}", e); - *self.restoration.lock() = None; + *restoration = None; *self.status.lock() = RestorationStatus::Failed; let _ = fs::remove_dir_all(self.restoration_dir()); } From 973a5a594b5276a645326ecbe337bea9db76b4d6 Mon Sep 17 00:00:00 2001 From: Dusan Stanivukovic Date: Wed, 3 Mar 2021 15:57:25 +0100 Subject: [PATCH 2/6] Sunce86/add support eip2930 ethereum tests runner (#288) * added support for eip2930 tests Co-authored-by: sunce86 --- Cargo.lock | 3 +- bin/evmbin/src/main.rs | 2 +- crates/ethcore/res/json_tests | 2 +- crates/ethcore/src/json_tests/runner.rs | 2 +- crates/ethcore/src/json_tests/state.rs | 6 +- crates/ethcore/types/Cargo.toml | 1 - crates/ethcore/types/src/lib.rs | 1 - crates/ethcore/types/src/log_entry.rs | 11 --- .../types/src/transaction/transaction.rs | 51 ---------- crates/ethjson/Cargo.toml | 2 + crates/ethjson/src/blockchain/transaction.rs | 2 +- crates/ethjson/src/lib.rs | 2 + crates/ethjson/src/state/test.rs | 98 +++++++++++++++++-- crates/ethjson/src/state/transaction.rs | 1 + 14 files changed, 101 insertions(+), 83 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 460fd08c9..edcfc1fd5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -439,7 +439,6 @@ name = "common-types" version = "0.1.0" dependencies = [ "ethereum-types 0.4.2", - "ethjson", "ethkey", "heapsize", "keccak-hash", @@ -1375,7 +1374,9 @@ dependencies = [ name = "ethjson" version = "0.1.0" dependencies = [ + "common-types", "ethereum-types 0.4.2", + "ethkey", "macros", "maplit", "rustc-hex 1.0.0", diff --git a/bin/evmbin/src/main.rs b/bin/evmbin/src/main.rs index a7a63474b..45b28f583 100644 --- a/bin/evmbin/src/main.rs +++ b/bin/evmbin/src/main.rs @@ -204,7 +204,7 @@ fn run_state_test(args: Args) { } for (idx, state) in states.into_iter().enumerate() { let post_root = state.hash.into(); - let transaction = multitransaction.select(&state.indexes).into(); + let transaction = multitransaction.select(&state.indexes); let trie_spec = if args.flag_std_dump_json { TrieSpec::Fat diff --git a/crates/ethcore/res/json_tests b/crates/ethcore/res/json_tests index 1508126ea..31d663076 160000 --- a/crates/ethcore/res/json_tests +++ b/crates/ethcore/res/json_tests @@ -1 +1 @@ -Subproject commit 1508126ea04cd61495b60db2f036ac823de274b1 +Subproject commit 31d663076b6678df18983d6da912d7cad4ad3416 diff --git a/crates/ethcore/src/json_tests/runner.rs b/crates/ethcore/src/json_tests/runner.rs index a82af46cc..1def4f91c 100644 --- a/crates/ethcore/src/json_tests/runner.rs +++ b/crates/ethcore/src/json_tests/runner.rs @@ -184,7 +184,7 @@ impl TestRunner { return Vec::new(); } } - super::state::json_chain_test(&test, &path, &json, &mut |_, _| {}) + super::state::json_state_test(&test, &path, &json, &mut |_, _| {}) }, ) } diff --git a/crates/ethcore/src/json_tests/state.rs b/crates/ethcore/src/json_tests/state.rs index 2b1c89ebc..0070b8710 100644 --- a/crates/ethcore/src/json_tests/state.rs +++ b/crates/ethcore/src/json_tests/state.rs @@ -20,7 +20,6 @@ use ethjson; use pod_state::PodState; use std::path::Path; use trace; -use types::transaction::SignedTransaction; use vm::EnvInfo; fn skip_test( @@ -42,7 +41,7 @@ fn skip_test( }) } -pub fn json_chain_test( +pub fn json_state_test( state_test: ðjson::test::StateTests, path: &Path, json_data: &[u8], @@ -91,8 +90,7 @@ pub fn json_chain_test( } let post_root: H256 = state.hash.into(); - let transaction: SignedTransaction = - multitransaction.select(&state.indexes).into(); + let transaction = multitransaction.select(&state.indexes); let result = || -> Result<_, EvmTestError> { Ok(EvmTestClient::from_pod_state(&spec, pre.clone())?.transact( diff --git a/crates/ethcore/types/Cargo.toml b/crates/ethcore/types/Cargo.toml index d6a18bcd1..9a16ddcb6 100644 --- a/crates/ethcore/types/Cargo.toml +++ b/crates/ethcore/types/Cargo.toml @@ -6,7 +6,6 @@ authors = ["Parity Technologies "] [dependencies] ethereum-types = "0.4" -ethjson = { path = "../../ethjson" } ethkey = { path = "../../accounts/ethkey" } heapsize = "0.4" keccak-hash = "0.1" diff --git a/crates/ethcore/types/src/lib.rs b/crates/ethcore/types/src/lib.rs index 833e5a61c..5c99c105b 100644 --- a/crates/ethcore/types/src/lib.rs +++ b/crates/ethcore/types/src/lib.rs @@ -35,7 +35,6 @@ #![warn(unused_extern_crates)] extern crate ethereum_types; -extern crate ethjson; extern crate ethkey; extern crate heapsize; extern crate keccak_hash as hash; diff --git a/crates/ethcore/types/src/log_entry.rs b/crates/ethcore/types/src/log_entry.rs index 89b56161b..129e78a92 100644 --- a/crates/ethcore/types/src/log_entry.rs +++ b/crates/ethcore/types/src/log_entry.rs @@ -21,7 +21,6 @@ use ethereum_types::{Address, Bloom, BloomInput, H256}; use heapsize::HeapSizeOf; use std::ops::Deref; -use ethjson; use BlockNumber; /// A record of execution for a `LOG` operation. @@ -53,16 +52,6 @@ impl LogEntry { } } -impl From for LogEntry { - fn from(l: ethjson::state::Log) -> Self { - LogEntry { - address: l.address.into(), - topics: l.topics.into_iter().map(Into::into).collect(), - data: l.data.into(), - } - } -} - /// Log localized in a blockchain. #[derive(Default, Debug, PartialEq, Clone)] pub struct LocalizedLogEntry { diff --git a/crates/ethcore/types/src/transaction/transaction.rs b/crates/ethcore/types/src/transaction/transaction.rs index 66f477fd9..892795a6a 100644 --- a/crates/ethcore/types/src/transaction/transaction.rs +++ b/crates/ethcore/types/src/transaction/transaction.rs @@ -17,7 +17,6 @@ //! Transaction data structure. use ethereum_types::{Address, H160, H256, U256}; -use ethjson; use ethkey::{self, public_to_address, recover, Public, Secret, Signature}; use hash::keccak; use heapsize::HeapSizeOf; @@ -606,56 +605,6 @@ impl SignatureComponents { } } -#[cfg(any(test, feature = "test-helpers"))] -impl From for SignedTransaction { - fn from(t: ethjson::state::Transaction) -> Self { - let to: Option = t.to.into(); - let secret = t.secret.map(|s| Secret::from(s.0)); - let tx = TypedTransaction::Legacy(Transaction { - nonce: t.nonce.into(), - gas_price: t.gas_price.into(), - gas: t.gas_limit.into(), - action: match to { - Some(to) => Action::Call(to.into()), - None => Action::Create, - }, - value: t.value.into(), - data: t.data.into(), - }); - match secret { - Some(s) => tx.sign(&s, None), - None => tx.null_sign(1), - } - } -} - -impl From for UnverifiedTransaction { - fn from(t: ethjson::transaction::Transaction) -> Self { - let to: Option = t.to.into(); - UnverifiedTransaction { - unsigned: TypedTransaction::Legacy(Transaction { - nonce: t.nonce.into(), - gas_price: t.gas_price.into(), - gas: t.gas_limit.into(), - action: match to { - Some(to) => Action::Call(to.into()), - None => Action::Create, - }, - value: t.value.into(), - data: t.data.into(), - }), - chain_id: signature::extract_chain_id_from_legacy_v(t.v.into()), - signature: SignatureComponents { - r: t.r.into(), - s: t.s.into(), - standard_v: signature::extract_standard_v(t.v.into()), - }, - hash: 0.into(), - } - .compute_hash() - } -} - /// Signed transaction information without verified signature. #[derive(Debug, Clone, Eq, PartialEq)] pub struct UnverifiedTransaction { diff --git a/crates/ethjson/Cargo.toml b/crates/ethjson/Cargo.toml index 584c04637..b86f34f1d 100644 --- a/crates/ethjson/Cargo.toml +++ b/crates/ethjson/Cargo.toml @@ -5,6 +5,8 @@ version = "0.1.0" authors = ["Parity Technologies "] [dependencies] +common-types = { path = "../ethcore/types", features = ["test-helpers"] } +ethkey = { path = "../accounts/ethkey" } ethereum-types = "0.4" rustc-hex = "1.0" serde = "1.0" diff --git a/crates/ethjson/src/blockchain/transaction.rs b/crates/ethjson/src/blockchain/transaction.rs index 003beb306..277e52001 100644 --- a/crates/ethjson/src/blockchain/transaction.rs +++ b/crates/ethjson/src/blockchain/transaction.rs @@ -41,7 +41,7 @@ pub struct Transaction { pub type AccessList = Vec; -#[derive(Debug, PartialEq, Deserialize)] +#[derive(Debug, PartialEq, Deserialize, Clone)] #[serde(rename_all = "camelCase")] pub struct AccessListItem { pub address: H160, diff --git a/crates/ethjson/src/lib.rs b/crates/ethjson/src/lib.rs index 2f8b67d19..f5a6d5f83 100644 --- a/crates/ethjson/src/lib.rs +++ b/crates/ethjson/src/lib.rs @@ -14,7 +14,9 @@ // You should have received a copy of the GNU General Public License // along with OpenEthereum. If not, see . +extern crate common_types as types; extern crate ethereum_types; +extern crate ethkey; extern crate rustc_hex; extern crate serde; extern crate serde_json; diff --git a/crates/ethjson/src/state/test.rs b/crates/ethjson/src/state/test.rs index 5c2439d3d..4411ff586 100644 --- a/crates/ethjson/src/state/test.rs +++ b/crates/ethjson/src/state/test.rs @@ -17,14 +17,18 @@ //! General test deserialization. use bytes::Bytes; +use ethkey::Secret; use hash::{Address, H256}; use maybe::MaybeEmpty; use serde_json::{self, Error}; use spec::ForkSpec; -use state::{AccountState, Env, Transaction}; +use state::{AccountState, Env}; use std::{collections::BTreeMap, io::Read}; +use types::transaction::{AccessListTx, Action, SignedTransaction, Transaction, TypedTransaction}; use uint::Uint; +use crate::blockchain::transaction::AccessList; + /// State test deserializer. #[derive(Debug, PartialEq, Deserialize)] pub struct Test(BTreeMap); @@ -69,6 +73,8 @@ pub struct State { pub struct MultiTransaction { /// Transaction data set. pub data: Vec, + /// Optional access list + pub access_lists: Option>>, /// Gas limit set. pub gas_limit: Vec, /// Gas price. @@ -84,18 +90,57 @@ pub struct MultiTransaction { pub value: Vec, } +fn sign_with_secret(tx: TypedTransaction, secret: Option) -> SignedTransaction { + match secret { + Some(s) => tx.sign(&s, None), + None => tx.null_sign(1), + } +} + impl MultiTransaction { /// Build transaction with given indexes. - pub fn select(&self, indexes: &PostStateIndexes) -> Transaction { - Transaction { - data: self.data[indexes.data as usize].clone(), - gas_limit: self.gas_limit[indexes.gas as usize].clone(), - gas_price: self.gas_price.clone(), - nonce: self.nonce.clone(), - secret: self.secret.clone(), - to: self.to.clone(), - value: self.value[indexes.value as usize].clone(), + pub fn select(&self, indexes: &PostStateIndexes) -> SignedTransaction { + let secret = self.secret.clone().map(|s| Secret::from(s.0)); + let to: Option
= self.to.clone().into(); + let transaction = Transaction { + nonce: self.nonce.clone().into(), + gas_price: self.gas_price.clone().into(), + gas: self.gas_limit[indexes.gas as usize].clone().into(), + action: match to { + Some(to) => Action::Call(to.into()), + None => Action::Create, + }, + value: self.value[indexes.value as usize].clone().into(), + data: self.data[indexes.data as usize].clone().into(), + }; + + if let Some(access_lists) = self.access_lists.as_ref() { + if access_lists.len() > indexes.data as usize { + if let Some(access_list) = access_lists[indexes.data as usize].clone() { + //access list type of transaction + + let access_list = access_list + .into_iter() + .map(|elem| { + ( + elem.address.into(), + elem.storage_keys.into_iter().map(Into::into).collect(), + ) + }) + .collect(); + + let tx = TypedTransaction::AccessList(AccessListTx { + transaction, + access_list, + }); + + return sign_with_secret(tx, secret); + } + } } + + let tx = TypedTransaction::Legacy(transaction); + sign_with_secret(tx, secret) } } @@ -138,6 +183,39 @@ mod tests { let _deserialized: MultiTransaction = serde_json::from_str(s).unwrap(); } + #[test] + fn multi_transaction_deserialization_with_access_list() { + let s = r#"{ + "data" : [ "" ], + "accessLists" : [ + null, + [ + ], + [ + { + "address" : "0x0000000000000000000000000000000000000102", + "storageKeys" : [ + ] + }, + { + "address" : "0x0000000000000000000000000000000000000101", + "storageKeys" : [ + "0x0000000000000000000000000000000000000000000000000000000000000000", + "0x0000000000000000000000000000000000000000000000000000000000000010" + ] + } + ] + ], + "gasLimit" : [ "0x2dc6c0", "0x222222" ], + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", + "value" : [ "0x00", "0x01", "0x02" ] + }"#; + let _deserialized: MultiTransaction = serde_json::from_str(s).unwrap(); + } + #[test] fn state_deserialization() { let s = r#"{ diff --git a/crates/ethjson/src/state/transaction.rs b/crates/ethjson/src/state/transaction.rs index 68e639c9c..b770a30a4 100644 --- a/crates/ethjson/src/state/transaction.rs +++ b/crates/ethjson/src/state/transaction.rs @@ -51,6 +51,7 @@ mod tests { fn transaction_deserialization() { let s = r#"{ "data" : "", + "accessLists": null, "gasLimit" : "0x2dc6c0", "gasPrice" : "0x01", "nonce" : "0x00", From 91e57c803dd1c46c443866e933cc557362d18259 Mon Sep 17 00:00:00 2001 From: rakita Date: Tue, 2 Mar 2021 22:48:04 +0100 Subject: [PATCH 3/6] Disable EIP-2315 --- crates/ethcore/res/chainspec/foundation.json | 1 - crates/ethcore/res/chainspec/goerli.json | 1 - crates/ethcore/res/chainspec/rinkeby.json | 1 - crates/ethcore/res/chainspec/ropsten.json | 1 - crates/ethcore/res/chainspec/yolo3.json | 1 - 5 files changed, 5 deletions(-) diff --git a/crates/ethcore/res/chainspec/foundation.json b/crates/ethcore/res/chainspec/foundation.json index 991fe18f5..af2f01258 100644 --- a/crates/ethcore/res/chainspec/foundation.json +++ b/crates/ethcore/res/chainspec/foundation.json @@ -170,7 +170,6 @@ "eip1706Transition": "0x8a61c8", "eip1884Transition": "0x8a61c8", "eip2028Transition": "0x8a61c8", - "eip2315Transition": "0xbad420", "eip2929Transition": "0xbad420", "eip2930Transition": "0xbad420" }, diff --git a/crates/ethcore/res/chainspec/goerli.json b/crates/ethcore/res/chainspec/goerli.json index 01f71a24a..7f61b10e3 100644 --- a/crates/ethcore/res/chainspec/goerli.json +++ b/crates/ethcore/res/chainspec/goerli.json @@ -31,7 +31,6 @@ "eip1706Transition": "0x17d433", "eip1884Transition": "0x17d433", "eip2028Transition": "0x17d433", - "eip2315Transition": "0x441064", "eip2929Transition": "0x441064", "eip2930Transition": "0x441064", "gasLimitBoundDivisor": "0x400", diff --git a/crates/ethcore/res/chainspec/rinkeby.json b/crates/ethcore/res/chainspec/rinkeby.json index 8a0c59df4..a9c3586d5 100644 --- a/crates/ethcore/res/chainspec/rinkeby.json +++ b/crates/ethcore/res/chainspec/rinkeby.json @@ -31,7 +31,6 @@ "eip1706Transition": "0x52efd1", "eip1884Transition": "0x52efd1", "eip2028Transition": "0x52efd1", - "eip2315Transition": "0x7e8270", "eip2929Transition": "0x7e8270", "eip2930Transition": "0x7e8270", "gasLimitBoundDivisor": "0x400", diff --git a/crates/ethcore/res/chainspec/ropsten.json b/crates/ethcore/res/chainspec/ropsten.json index 5c7a7a4ed..7ab2ef30e 100644 --- a/crates/ethcore/res/chainspec/ropsten.json +++ b/crates/ethcore/res/chainspec/ropsten.json @@ -52,7 +52,6 @@ "eip1706Transition": "0x62f756", "eip1884Transition": "0x62f756", "eip2028Transition": "0x62f756", - "eip2315Transition": "0x95b8dd", "eip2929Transition": "0x95b8dd", "eip2930Transition": "0x95b8dd" diff --git a/crates/ethcore/res/chainspec/yolo3.json b/crates/ethcore/res/chainspec/yolo3.json index 114de8c11..e33658c2e 100644 --- a/crates/ethcore/res/chainspec/yolo3.json +++ b/crates/ethcore/res/chainspec/yolo3.json @@ -28,7 +28,6 @@ "eip2028Transition": "0x0", "eip211Transition": "0x0", "eip214Transition": "0x0", - "eip2315Transition": "0x0", "eip2929Transition": "0x0", "eip2930Transition": "0x0", "eip658Transition": "0x0", From 0cf0cdbb8638119f52c12fa81f11452ea7e321fc Mon Sep 17 00:00:00 2001 From: rakita Date: Fri, 5 Mar 2021 19:25:31 +0100 Subject: [PATCH 4/6] Disable CI on tag for windows2019 machine" This reverts commit efb80e10324973223a8d7e64941b795aa6156e48. --- .github/workflows/build.yml | 92 ++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0cdce5120..fae328913 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,6 @@ jobs: platform: - ubuntu-16.04 - macos-latest - - windows2019 toolchain: - stable runs-on: ${{ matrix.platform }} @@ -37,25 +36,25 @@ jobs: # Windows Build # ============================== - - name: Install LLVM for Windows - if: matrix.platform == 'windows2019' - run: choco install llvm -y + # - name: Install LLVM for Windows + # if: matrix.platform == 'windows2019' + # run: choco install llvm - - name: Build OpenEthereum for Windows - if: matrix.platform == 'windows2019' - run: sh scripts/actions/build-windows.sh ${{matrix.platform}} + # - name: Build OpenEthereum for Windows + # if: matrix.platform == 'windows2019' + # run: sh scripts/actions/build-windows.sh ${{matrix.platform}} - - name: Upload Windows build - uses: actions/upload-artifact@v2 - if: matrix.platform == 'windows2019' - with: - name: windows-artifacts - path: artifacts + # - name: Upload Windows build + # uses: actions/upload-artifact@v2 + # if: matrix.platform == 'windows2019' + # with: + # name: windows-artifacts + # path: artifacts # ============================== # Linux/Macos Build # ============================== - + - name: Build OpenEthereum for ${{matrix.platform}} if: matrix.platform != 'windows2019' run: sh scripts/actions/build-linux.sh ${{matrix.platform}} @@ -133,17 +132,18 @@ jobs: echo ::set-output name=MACOS_ARTIFACT::openethereum-macos-${{ env.RELEASE_VERSION }}.zip echo ::set-output name=MACOS_SHASUM::$(shasum -a 256 openethereum-macos-${{ env.RELEASE_VERSION }}.zip | awk '{print $1}') - - name: Create zip Windows - id: create_zip_windows - run: | - cd windows-artifacts/ - zip -rT openethereum-windows-${{ env.RELEASE_VERSION }}.zip * - ls openethereum-windows-${{ env.RELEASE_VERSION }}.zip - cd .. - mv windows-artifacts/openethereum-windows-${{ env.RELEASE_VERSION }}.zip . - echo "Setting outputs..." - echo ::set-output name=WINDOWS_ARTIFACT::openethereum-windows-${{ env.RELEASE_VERSION }}.zip - echo ::set-output name=WINDOWS_SHASUM::$(shasum -a 256 openethereum-windows-${{ env.RELEASE_VERSION }}.zip | awk '{print $1}') + # - name: Create zip Windows + # id: create_zip_windows + # run: | + # cd windows-artifacts/ + # zip -rT openethereum-windows-${{ env.RELEASE_VERSION }}.zip * + # ls openethereum-windows-${{ env.RELEASE_VERSION }}.zip + # cd .. + # mv windows-artifacts/openethereum-windows-${{ env.RELEASE_VERSION }}.zip . + + # echo "Setting outputs..." + # echo ::set-output name=WINDOWS_ARTIFACT::openethereum-windows-${{ env.RELEASE_VERSION }}.zip + # echo ::set-output name=WINDOWS_SHASUM::$(shasum -a 256 openethereum-windows-${{ env.RELEASE_VERSION }}.zip | awk '{print $1}') # ======================================================================= # Upload artifacts @@ -162,11 +162,11 @@ jobs: name: openethereum-macos-${{ env.RELEASE_VERSION }}.zip path: openethereum-macos-${{ env.RELEASE_VERSION }}.zip - - name: Upload artifacts - uses: actions/upload-artifact@v2 - with: - name: openethereum-windows-${{ env.RELEASE_VERSION }}.zip - path: openethereum-windows-${{ env.RELEASE_VERSION }}.zip + # - name: Upload artifacts + # uses: actions/upload-artifact@v2 + # with: + # name: openethereum-windows-${{ env.RELEASE_VERSION }}.zip + # path: openethereum-windows-${{ env.RELEASE_VERSION }}.zip # ======================================================================= # Upload artifacts to S3 @@ -191,8 +191,8 @@ jobs: linux-shasum: ${{ steps.create_zip_linux.outputs.LINUX_SHASUM }} macos-artifact: ${{ steps.create_zip_macos.outputs.MACOS_ARTIFACT }} macos-shasum: ${{ steps.create_zip_macos.outputs.MACOS_SHASUM }} - windows-artifact: ${{ steps.create_zip_windows.outputs.WINDOWS_ARTIFACT }} - windows-shasum: ${{ steps.create_zip_windows.outputs.WINDOWS_SHASUM }} + # windows-artifact: ${{ steps.create_zip_windows.outputs.WINDOWS_ARTIFACT }} + # windows-shasum: ${{ steps.create_zip_windows.outputs.WINDOWS_SHASUM }} draft-release: name: Draft Release @@ -216,10 +216,10 @@ jobs: with: name: openethereum-macos-${{ env.RELEASE_VERSION }}.zip - - name: Download artifacts - uses: actions/download-artifact@v2 - with: - name: openethereum-windows-${{ env.RELEASE_VERSION }}.zip + # - name: Download artifacts + # uses: actions/download-artifact@v2 + # with: + # name: openethereum-windows-${{ env.RELEASE_VERSION }}.zip - name: Display structure of downloaded files run: ls @@ -273,13 +273,13 @@ jobs: asset_name: openethereum-macos-${{ env.RELEASE_VERSION }}.zip asset_content_type: application/zip - - name: Upload Release Asset - Windows - id: upload_release_asset_windows - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release_draft.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps - asset_path: ./openethereum-windows-${{ env.RELEASE_VERSION }}.zip - asset_name: openethereum-windows-${{ env.RELEASE_VERSION }}.zip - asset_content_type: application/zip + # - name: Upload Release Asset - Windows + # id: upload_release_asset_windows + # uses: actions/upload-release-asset@v1 + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # with: + # upload_url: ${{ steps.create_release_draft.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps + # asset_path: ./openethereum-windows-${{ env.RELEASE_VERSION }}.zip + # asset_name: openethereum-windows-${{ env.RELEASE_VERSION }}.zip + # asset_content_type: application/zip From 458d55559e171873cd662ab0cbaa91aef61f4e74 Mon Sep 17 00:00:00 2001 From: rakita Date: Mon, 8 Mar 2021 17:49:59 +0100 Subject: [PATCH 5/6] Bump to v3.2.0 --- CHANGELOG.md | 5 +++-- Cargo.lock | 4 ++-- Cargo.toml | 2 +- crates/util/version/Cargo.toml | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cda2d5f1d..ea086927d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,10 @@ -## OpenEthereum v3.2.0-rc.1 +## OpenEthereum v3.2.0 Bug fixes: * Update EWF's chains with Istanbul transition block numbers (#11482) (#254) * fix Supplied instant is later than self (#169) - +* ethcore/snapshot: fix double-lock in Service::feed_chunk (#289) + Enhancements: * Berlin hardfork blocks: mainnet (12,244,000), goerli (4,460,644), rinkeby (8,290,928) and ropsten (9,812,189) * yolo3x spec (#241) diff --git a/Cargo.lock b/Cargo.lock index edcfc1fd5..c232f7753 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2825,7 +2825,7 @@ checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" [[package]] name = "openethereum" -version = "3.2.0-rc.1" +version = "3.2.0" dependencies = [ "ansi_term 0.10.2", "atty", @@ -3188,7 +3188,7 @@ dependencies = [ [[package]] name = "parity-version" -version = "3.2.0-rc.1" +version = "3.2.0" dependencies = [ "parity-bytes", "rlp 0.3.0", diff --git a/Cargo.toml b/Cargo.toml index 5035c20d9..2906d1545 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ description = "OpenEthereum" name = "openethereum" # NOTE Make sure to update util/version/Cargo.toml as well -version = "3.2.0-rc.1" +version = "3.2.0" license = "GPL-3.0" authors = [ "OpenEthereum developers", diff --git a/crates/util/version/Cargo.toml b/crates/util/version/Cargo.toml index 83d92c675..7fdef2e3b 100644 --- a/crates/util/version/Cargo.toml +++ b/crates/util/version/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "parity-version" # NOTE: this value is used for OpenEthereum version string (via env CARGO_PKG_VERSION) -version = "3.2.0-rc.1" +version = "3.2.0" authors = ["Parity Technologies "] build = "build.rs" From 187c81b3f16b736cad68f949f0c06bcb6ce71e64 Mon Sep 17 00:00:00 2001 From: rakita Date: Wed, 10 Mar 2021 17:14:08 +0100 Subject: [PATCH 6/6] Upgrade ethereum/tests to v8.0.1 (#301) --- crates/ethcore/res/chainspec/test/berlin_test.json | 3 +-- crates/ethcore/res/json_tests | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/crates/ethcore/res/chainspec/test/berlin_test.json b/crates/ethcore/res/chainspec/test/berlin_test.json index 1cc68c7b7..acf055033 100644 --- a/crates/ethcore/res/chainspec/test/berlin_test.json +++ b/crates/ethcore/res/chainspec/test/berlin_test.json @@ -43,7 +43,6 @@ "eip1706Transition": "0x0", "eip1884Transition": "0x0", "eip2028Transition": "0x0", - "eip2315Transition": "0x0", "eip2929Transition": "0x0", "eip2930Transition": "0x0" }, @@ -203,4 +202,4 @@ } } } -} \ No newline at end of file +} diff --git a/crates/ethcore/res/json_tests b/crates/ethcore/res/json_tests index 31d663076..e431795bf 160000 --- a/crates/ethcore/res/json_tests +++ b/crates/ethcore/res/json_tests @@ -1 +1 @@ -Subproject commit 31d663076b6678df18983d6da912d7cad4ad3416 +Subproject commit e431795bf750166671afc3516f5e0332af3318f1