for NonceAndGasPrice {
+impl txpool::Scoring
for NonceAndGasPrice where P: ScoredTransaction + txpool::VerifiedTransaction {
type Score = U256;
type Event = ();
- fn compare(&self, old: &VerifiedTransaction, other: &VerifiedTransaction) -> cmp::Ordering {
- old.transaction.nonce.cmp(&other.transaction.nonce)
+ fn compare(&self, old: &P, other: &P) -> cmp::Ordering {
+ old.nonce().cmp(&other.nonce())
}
- fn choose(&self, old: &VerifiedTransaction, new: &VerifiedTransaction) -> scoring::Choice {
- if old.transaction.nonce != new.transaction.nonce {
+ fn choose(&self, old: &P, new: &P) -> scoring::Choice {
+ if old.nonce() != new.nonce() {
return scoring::Choice::InsertNew
}
- let old_gp = old.transaction.gas_price;
- let new_gp = new.transaction.gas_price;
+ let old_gp = old.gas_price();
+ let new_gp = new.gas_price();
- let min_required_gp = bump_gas_price(old_gp);
+ let min_required_gp = bump_gas_price(*old_gp);
match min_required_gp.cmp(&new_gp) {
cmp::Ordering::Greater => scoring::Choice::RejectNew,
@@ -91,7 +91,7 @@ impl txpool::Scoring for NonceAndGasPrice {
}
}
- fn update_scores(&self, txs: &[txpool::Transaction], scores: &mut [U256], change: scoring::Change) {
+ fn update_scores(&self, txs: &[txpool::Transaction], scores: &mut [U256], change: scoring::Change) {
use self::scoring::Change;
match change {
@@ -101,7 +101,7 @@ impl txpool::Scoring for NonceAndGasPrice {
assert!(i < txs.len());
assert!(i < scores.len());
- scores[i] = txs[i].transaction.transaction.gas_price;
+ scores[i] = *txs[i].transaction.gas_price();
let boost = match txs[i].priority() {
super::Priority::Local => 15,
super::Priority::Retracted => 10,
@@ -122,10 +122,10 @@ impl txpool::Scoring for NonceAndGasPrice {
}
}
- fn should_replace(&self, old: &VerifiedTransaction, new: &VerifiedTransaction) -> scoring::Choice {
- if old.sender == new.sender {
+ fn should_replace(&self, old: &P, new: &P) -> scoring::Choice {
+ if old.sender() == new.sender() {
// prefer earliest transaction
- match new.transaction.nonce.cmp(&old.transaction.nonce) {
+ match new.nonce().cmp(&old.nonce()) {
cmp::Ordering::Less => scoring::Choice::ReplaceOld,
cmp::Ordering::Greater => scoring::Choice::RejectNew,
cmp::Ordering::Equal => self.choose(old, new),
@@ -134,8 +134,8 @@ impl txpool::Scoring for NonceAndGasPrice {
// accept local transactions over the limit
scoring::Choice::InsertNew
} else {
- let old_score = (old.priority(), old.transaction.gas_price);
- let new_score = (new.priority(), new.transaction.gas_price);
+ let old_score = (old.priority(), old.gas_price());
+ let new_score = (new.priority(), new.gas_price());
if new_score > old_score {
scoring::Choice::ReplaceOld
} else {
@@ -144,7 +144,7 @@ impl txpool::Scoring for NonceAndGasPrice {
}
}
- fn should_ignore_sender_limit(&self, new: &VerifiedTransaction) -> bool {
+ fn should_ignore_sender_limit(&self, new: &P) -> bool {
new.priority().is_local()
}
}
@@ -185,12 +185,8 @@ mod tests {
};
let keypair = Random.generate().unwrap();
- let txs = vec![tx1, tx2, tx3, tx4].into_iter().enumerate().map(|(i, tx)| {
- let verified = tx.unsigned().sign(keypair.secret(), None).verified();
- txpool::Transaction {
- insertion_id: i as u64,
- transaction: Arc::new(verified),
- }
+ let txs = vec![tx1, tx2, tx3, tx4].into_iter().map(|tx| {
+ tx.unsigned().sign(keypair.secret(), None).verified()
}).collect::>();
assert_eq!(scoring.should_replace(&txs[0], &txs[1]), RejectNew);
@@ -213,11 +209,7 @@ mod tests {
gas_price: 1,
..Default::default()
};
- let verified_tx = tx.signed().verified();
- txpool::Transaction {
- insertion_id: 0,
- transaction: Arc::new(verified_tx),
- }
+ tx.signed().verified()
};
let tx_regular_high_gas = {
let tx = Tx {
@@ -225,11 +217,7 @@ mod tests {
gas_price: 10,
..Default::default()
};
- let verified_tx = tx.signed().verified();
- txpool::Transaction {
- insertion_id: 1,
- transaction: Arc::new(verified_tx),
- }
+ tx.signed().verified()
};
let tx_local_low_gas = {
let tx = Tx {
@@ -239,10 +227,7 @@ mod tests {
};
let mut verified_tx = tx.signed().verified();
verified_tx.priority = ::pool::Priority::Local;
- txpool::Transaction {
- insertion_id: 2,
- transaction: Arc::new(verified_tx),
- }
+ verified_tx
};
let tx_local_high_gas = {
let tx = Tx {
@@ -252,10 +237,7 @@ mod tests {
};
let mut verified_tx = tx.signed().verified();
verified_tx.priority = ::pool::Priority::Local;
- txpool::Transaction {
- insertion_id: 3,
- transaction: Arc::new(verified_tx),
- }
+ verified_tx
};
assert_eq!(scoring.should_replace(&tx_regular_low_gas, &tx_regular_high_gas), ReplaceOld);
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index 53dddf9ea92..09b7c860398 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -39,6 +39,7 @@ ethash = { path = "../ethash" }
ethcore = { path = "../ethcore", features = ["test-helpers"] }
parity-bytes = "0.1"
parity-crypto = "0.1"
+fastmap = { path = "../util/fastmap" }
ethcore-devtools = { path = "../devtools" }
ethcore-io = { path = "../util/io" }
ethcore-light = { path = "../ethcore/light" }
diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs
index 2e731cd3475..2f3f4968ec9 100644
--- a/rpc/src/lib.rs
+++ b/rpc/src/lib.rs
@@ -44,6 +44,7 @@ extern crate jsonrpc_pubsub;
extern crate ethash;
extern crate ethcore;
+extern crate fastmap;
extern crate parity_bytes as bytes;
extern crate parity_crypto as crypto;
extern crate ethcore_devtools as devtools;
diff --git a/rpc/src/v1/helpers/errors.rs b/rpc/src/v1/helpers/errors.rs
index 4afd40ff843..33575fcf1f4 100644
--- a/rpc/src/v1/helpers/errors.rs
+++ b/rpc/src/v1/helpers/errors.rs
@@ -101,6 +101,14 @@ pub fn request_rejected_limit() -> Error {
}
}
+pub fn request_rejected_param_limit(limit: u64, items_desc: &str) -> Error {
+ Error {
+ code: ErrorCode::ServerError(codes::REQUEST_REJECTED_LIMIT),
+ message: format!("Requested data size exceeds limit of {} {}.", limit, items_desc),
+ data: None,
+ }
+}
+
pub fn account(error: &str, details: T) -> Error {
Error {
code: ErrorCode::ServerError(codes::ACCOUNT_ERROR),
diff --git a/rpc/src/v1/helpers/light_fetch.rs b/rpc/src/v1/helpers/light_fetch.rs
index 51fb0a5f837..6b1ecf493ba 100644
--- a/rpc/src/v1/helpers/light_fetch.rs
+++ b/rpc/src/v1/helpers/light_fetch.rs
@@ -16,6 +16,7 @@
//! Helpers for fetching blockchain data either from the light client or the network.
+use std::cmp;
use std::sync::Arc;
use ethcore::basic_account::BasicAccount;
@@ -31,7 +32,7 @@ use jsonrpc_macros::Trailing;
use light::cache::Cache;
use light::client::LightChainClient;
-use light::cht;
+use light::{cht, MAX_HEADERS_PER_REQUEST};
use light::on_demand::{
request, OnDemand, HeaderRef, Request as OnDemandRequest,
Response as OnDemandResponse, ExecutionResult,
@@ -42,6 +43,7 @@ use sync::LightSync;
use ethereum_types::{U256, Address};
use hash::H256;
use parking_lot::Mutex;
+use fastmap::H256FastMap;
use transaction::{Action, Transaction as EthTransaction, SignedTransaction, LocalizedTransaction};
use v1::helpers::{CallRequest as CallRequestHelper, errors, dispatch};
@@ -299,78 +301,67 @@ impl LightFetch {
use std::collections::BTreeMap;
use jsonrpc_core::futures::stream::{self, Stream};
- // early exit for "to" block before "from" block.
- let best_number = self.client.chain_info().best_block_number;
- let block_number = |id| match id {
- BlockId::Earliest => Some(0),
- BlockId::Latest => Some(best_number),
- BlockId::Hash(h) => self.client.block_header(BlockId::Hash(h)).map(|hdr| hdr.number()),
- BlockId::Number(x) => Some(x),
- };
-
- let (from_block_number, from_block_header) = match self.client.block_header(filter.from_block) {
- Some(from) => (from.number(), from),
- None => return Either::A(future::err(errors::unknown_block())),
- };
+ const MAX_BLOCK_RANGE: u64 = 1000;
- match block_number(filter.to_block) {
- Some(to) if to < from_block_number || from_block_number > best_number
- => return Either::A(future::ok(Vec::new())),
- Some(_) => (),
- _ => return Either::A(future::err(errors::unknown_block())),
- }
-
- let maybe_future = self.sync.with_context(move |ctx| {
- // find all headers which match the filter, and fetch the receipts for each one.
- // match them with their numbers for easy sorting later.
- let bit_combos = filter.bloom_possibilities();
- let receipts_futures: Vec<_> = self.client.ancestry_iter(filter.to_block)
- .take_while(|ref hdr| hdr.number() != from_block_number)
- .chain(Some(from_block_header))
- .filter(|ref hdr| {
- let hdr_bloom = hdr.log_bloom();
- bit_combos.iter().any(|bloom| hdr_bloom.contains_bloom(bloom))
- })
- .map(|hdr| (hdr.number(), hdr.hash(), request::BlockReceipts(hdr.into())))
- .map(|(num, hash, req)| self.on_demand.request(ctx, req).expect(NO_INVALID_BACK_REFS).map(move |x| (num, hash, x)))
- .collect();
+ let fetcher = self.clone();
+ self.headers_range_by_block_id(filter.from_block, filter.to_block, MAX_BLOCK_RANGE)
+ .and_then(move |mut headers| {
+ if headers.is_empty() {
+ return Either::A(future::ok(Vec::new()));
+ }
- // as the receipts come in, find logs within them which match the filter.
- // insert them into a BTreeMap to maintain order by number and block index.
- stream::futures_unordered(receipts_futures)
- .fold(BTreeMap::new(), move |mut matches, (num, hash, receipts)| {
- let mut block_index = 0;
- for (transaction_index, receipt) in receipts.into_iter().enumerate() {
- for (transaction_log_index, log) in receipt.logs.into_iter().enumerate() {
- if filter.matches(&log) {
- matches.insert((num, block_index), Log {
- address: log.address.into(),
- topics: log.topics.into_iter().map(Into::into).collect(),
- data: log.data.into(),
- block_hash: Some(hash.into()),
- block_number: Some(num.into()),
- // No way to easily retrieve transaction hash, so let's just skip it.
- transaction_hash: None,
- transaction_index: Some(transaction_index.into()),
- log_index: Some(block_index.into()),
- transaction_log_index: Some(transaction_log_index.into()),
- log_type: "mined".into(),
- removed: false,
- });
+ let on_demand = &fetcher.on_demand;
+
+ let maybe_future = fetcher.sync.with_context(move |ctx| {
+ // find all headers which match the filter, and fetch the receipts for each one.
+ // match them with their numbers for easy sorting later.
+ let bit_combos = filter.bloom_possibilities();
+ let receipts_futures: Vec<_> = headers.drain(..)
+ .filter(|ref hdr| {
+ let hdr_bloom = hdr.log_bloom();
+ bit_combos.iter().any(|bloom| hdr_bloom.contains_bloom(bloom))
+ })
+ .map(|hdr| (hdr.number(), hdr.hash(), request::BlockReceipts(hdr.into())))
+ .map(|(num, hash, req)| on_demand.request(ctx, req).expect(NO_INVALID_BACK_REFS).map(move |x| (num, hash, x)))
+ .collect();
+
+ // as the receipts come in, find logs within them which match the filter.
+ // insert them into a BTreeMap to maintain order by number and block index.
+ stream::futures_unordered(receipts_futures)
+ .fold(BTreeMap::new(), move |mut matches, (num, hash, receipts)| {
+ let mut block_index = 0;
+ for (transaction_index, receipt) in receipts.into_iter().enumerate() {
+ for (transaction_log_index, log) in receipt.logs.into_iter().enumerate() {
+ if filter.matches(&log) {
+ matches.insert((num, block_index), Log {
+ address: log.address.into(),
+ topics: log.topics.into_iter().map(Into::into).collect(),
+ data: log.data.into(),
+ block_hash: Some(hash.into()),
+ block_number: Some(num.into()),
+ // No way to easily retrieve transaction hash, so let's just skip it.
+ transaction_hash: None,
+ transaction_index: Some(transaction_index.into()),
+ log_index: Some(block_index.into()),
+ transaction_log_index: Some(transaction_log_index.into()),
+ log_type: "mined".into(),
+ removed: false,
+ });
+ }
+ block_index += 1;
+ }
}
- block_index += 1;
- }
- }
- future::ok(matches)
- }) // and then collect them into a vector.
- .map(|matches| matches.into_iter().map(|(_, v)| v).collect())
- .map_err(errors::on_demand_cancel)
- });
-
- match maybe_future {
- Some(fut) => Either::B(Either::A(fut)),
- None => Either::B(Either::B(future::err(errors::network_disabled()))),
- }
+ future::ok(matches)
+ }) // and then collect them into a vector.
+ .map(|matches| matches.into_iter().map(|(_, v)| v).collect())
+ .map_err(errors::on_demand_cancel)
+ });
+
+ match maybe_future {
+ Some(fut) => Either::B(Either::A(fut)),
+ None => Either::B(Either::B(future::err(errors::network_disabled()))),
+ }
+ })
}
// Get a transaction by hash. also returns the index in the block.
@@ -448,6 +439,150 @@ impl LightFetch {
None => Box::new(future::err(errors::network_disabled())) as Box + Send>
}
}
+
+ fn headers_range_by_block_id(
+ &self,
+ from_block: BlockId,
+ to_block: BlockId,
+ max: u64
+ ) -> impl Future- , Error = Error> {
+ let fetch_hashes = [from_block, to_block].iter()
+ .filter_map(|block_id| match block_id {
+ BlockId::Hash(hash) => Some(hash.clone()),
+ _ => None,
+ })
+ .collect::>();
+
+ let best_number = self.client.chain_info().best_block_number;
+
+ let fetcher = self.clone();
+ self.headers_by_hash(&fetch_hashes[..]).and_then(move |mut header_map| {
+ let (from_block_num, to_block_num) = {
+ let block_number = |id| match id {
+ &BlockId::Earliest => 0,
+ &BlockId::Latest => best_number,
+ &BlockId::Hash(ref h) =>
+ header_map.get(h).map(|hdr| hdr.number())
+ .expect("from_block and to_block headers are fetched by hash; this closure is only called on from_block and to_block; qed"),
+ &BlockId::Number(x) => x,
+ };
+ (block_number(&from_block), block_number(&to_block))
+ };
+
+ if to_block_num < from_block_num {
+ // early exit for "to" block before "from" block.
+ return Either::A(future::err(errors::filter_block_not_found(to_block)));
+ } else if to_block_num - from_block_num >= max {
+ return Either::A(future::err(errors::request_rejected_param_limit(max, "blocks")));
+ }
+
+ let to_header_hint = match to_block {
+ BlockId::Hash(ref h) => header_map.remove(h),
+ _ => None,
+ };
+ let headers_fut = fetcher.headers_range(from_block_num, to_block_num, to_header_hint);
+ Either::B(headers_fut.map(move |headers| {
+ // Validate from_block if it's a hash
+ let last_hash = headers.last().map(|hdr| hdr.hash());
+ match (last_hash, from_block) {
+ (Some(h1), BlockId::Hash(h2)) if h1 != h2 => Vec::new(),
+ _ => headers,
+ }
+ }))
+ })
+ }
+
+ fn headers_by_hash(&self, hashes: &[H256]) -> impl Future
- , Error = Error> {
+ let mut refs = H256FastMap::with_capacity_and_hasher(hashes.len(), Default::default());
+ let mut reqs = Vec::with_capacity(hashes.len());
+
+ for hash in hashes {
+ refs.entry(*hash).or_insert_with(|| {
+ self.make_header_requests(BlockId::Hash(*hash), &mut reqs)
+ .expect("make_header_requests never fails for BlockId::Hash; qed")
+ });
+ }
+
+ self.send_requests(reqs, move |res| {
+ let headers = refs.drain()
+ .map(|(hash, header_ref)| {
+ let hdr = extract_header(&res, header_ref)
+ .expect("these responses correspond to requests that header_ref belongs to; \
+ qed");
+ (hash, hdr)
+ })
+ .collect();
+ headers
+ })
+ }
+
+ fn headers_range(
+ &self,
+ from_number: u64,
+ to_number: u64,
+ to_header_hint: Option
+ ) -> impl Future
- , Error = Error> {
+ let range_length = (to_number - from_number + 1) as usize;
+ let mut headers: Vec = Vec::with_capacity(range_length);
+
+ let iter_start = match to_header_hint {
+ Some(hdr) => {
+ let block_id = BlockId::Hash(hdr.parent_hash());
+ headers.push(hdr);
+ block_id
+ }
+ None => BlockId::Number(to_number),
+ };
+ headers.extend(self.client.ancestry_iter(iter_start)
+ .take_while(|hdr| hdr.number() >= from_number));
+
+ let fetcher = self.clone();
+ future::loop_fn(headers, move |mut headers| {
+ let remaining = range_length - headers.len();
+ if remaining == 0 {
+ return Either::A(future::ok(future::Loop::Break(headers)));
+ }
+
+ let mut reqs: Vec = Vec::with_capacity(2);
+
+ let start_hash = if let Some(hdr) = headers.last() {
+ hdr.parent_hash().into()
+ } else {
+ let cht_root = cht::block_to_cht_number(to_number)
+ .and_then(|cht_num| fetcher.client.cht_root(cht_num as usize));
+
+ let cht_root = match cht_root {
+ Some(cht_root) => cht_root,
+ None => return Either::A(future::err(errors::unknown_block())),
+ };
+
+ let header_proof = request::HeaderProof::new(to_number, cht_root)
+ .expect("HeaderProof::new is Some(_) if cht::block_to_cht_number() is Some(_); \
+ this would return above if block_to_cht_number returned None; qed");
+
+ let idx = reqs.len();
+ let hash_ref = Field::back_ref(idx, 0);
+ reqs.push(header_proof.into());
+
+ hash_ref
+ };
+
+ let max = cmp::min(remaining as u64, MAX_HEADERS_PER_REQUEST);
+ reqs.push(request::HeaderWithAncestors {
+ block_hash: start_hash,
+ ancestor_count: max - 1,
+ }.into());
+
+ Either::B(fetcher.send_requests(reqs, |mut res| {
+ match res.last_mut() {
+ Some(&mut OnDemandResponse::HeaderWithAncestors(ref mut res_headers)) =>
+ headers.extend(res_headers.drain(..)),
+ _ => panic!("reqs has at least one entry; each request maps to a response; qed"),
+ };
+ future::Loop::Continue(headers)
+ }))
+ })
+ }
}
#[derive(Clone)]
diff --git a/scripts/cov.sh b/scripts/cov.sh
deleted file mode 100755
index b6d25c6921c..00000000000
--- a/scripts/cov.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-# Installing KCOV under ubuntu
-# https://users.rust-lang.org/t/tutorial-how-to-collect-test-coverages-for-rust-project/650#
-### Install deps
-# $ sudo apt-get install libcurl4-openssl-dev libelf-dev libdw-dev cmake gcc binutils-dev libiberty-dev
-#
-### Compile kcov
-# $ wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz && tar xf master.tar.gz
-# $ cd kcov-master && mkdir build && cd build
-# $ cmake .. && make && sudo make install
-
-### Running coverage
-
-set -x
-RUSTFLAGS="-C link-dead-code" cargo test --all --no-run || exit $?
-KCOV_TARGET="target/cov"
-KCOV_FLAGS="--verify"
-mkdir -p $KCOV_TARGET
-echo "Cover RUST"
-for FILE in `find target/debug/deps ! -name "*.*"`
-do
- timeout --signal=SIGKILL 5m kcov --include-path=$(pwd) --exclude-path=$(pwd)/target $KCOV_FLAGS $KCOV_TARGET $FILE
-done
-timeout --signal=SIGKILL 5m kcov --include-path=$(pwd) --exclude-path=$(pwd)/target $KCOV_FLAGS $KCOV_TARGET target/debug/parity-*
-echo "Cover JS"
-cd js
-npm install&&npm run test:coverage
-cd ..
-bash <(curl -s https://codecov.io/bash)&&
- echo "Uploaded code coverage"
-exit 0
diff --git a/scripts/docker-build.sh b/scripts/docker-build.sh
deleted file mode 100755
index b880d33b71a..00000000000
--- a/scripts/docker-build.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-cd docker/hub
-DOCKER_BUILD_TAG=$1
-echo "Docker build tag: " $DOCKER_BUILD_TAG
-if [[ "$DOCKER_BUILD_TAG" = "latest" ]]; then
- docker build --build-arg BUILD_TAG="master" --no-cache=true --tag parity/parity:$DOCKER_BUILD_TAG .
-else
- docker build --build-arg BUILD_TAG=$DOCKER_BUILD_TAG --no-cache=true --tag parity/parity:$DOCKER_BUILD_TAG .
-fi
-docker run -it parity/parity:$DOCKER_BUILD_TAG -v
-docker push parity/parity:$DOCKER_BUILD_TAG
diff --git a/scripts/gitlab-build.sh b/scripts/gitlab-build.sh
deleted file mode 100755
index 014cab8e622..00000000000
--- a/scripts/gitlab-build.sh
+++ /dev/null
@@ -1,234 +0,0 @@
-#!/usr/bin/env bash
-
-set -e # fail on any error
-set -u # treat unset variables as error
-#ARGUMENTS: 1. BUILD_PLATFORM (target for binaries) 2. PLATFORM (target for cargo) 3. ARC (architecture) 4. & 5. CC & CXX flags 6. binary identifier
-BUILD_PLATFORM=$1
-PLATFORM=$2
-ARC=$3
-CC=$4
-CXX=$5
-IDENT=$6
-VER="$(grep -m 1 "version =" Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")"
-S3WIN=""
-echo "--------------------"
-echo "Build for platform: " $BUILD_PLATFORM
-echo "Build identifier: " $IDENT
-echo "Cargo target: " $PLATFORM
-echo "CC&CXX flags: " $CC ", " $CXX
-echo "Architecture: " $ARC
-echo "Parity version: " $VER
-echo "Branch: " $CI_BUILD_REF_NAME
-echo "--------------------"
-
-# NOTE for sha256 we want to display filename as well
-# hence we use --* instead of -p *
-SHA256_BIN="rhash --sha256"
-
-set_env () {
- echo "Set ENVIROMENT"
- export HOST_CC=gcc
- export HOST_CXX=g++
- rm -rf .cargo
- mkdir -p .cargo
- echo "[target.$PLATFORM]" >> .cargo/config
- echo "linker= \"$CC\"" >> .cargo/config
- cat .cargo/config
-}
-set_env_win () {
- set PLATFORM=x86_64-pc-windows-msvc
- set INCLUDE="C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Include;C:\vs2015\VC\include;C:\Program Files (x86)\Windows Kits\10\Include\10.0.10240.0\ucrt"
- set LIB="C:\vs2015\VC\lib;C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10240.0\ucrt\x64"
- set RUST_BACKTRACE=1
- #export RUSTFLAGS=$RUSTFLAGS
- rustup default stable-x86_64-pc-windows-msvc
- echo "@ signtool sign /f "\%"1 /p "\%"2 /tr http://timestamp.comodoca.com /du https://parity.io "\%"3" > sign.cmd
-}
-build () {
- if [[ "windows" = $IDENT ]]
- then
- # This is a nasty hack till we figure out the proper cargo caching strategy
- echo "Remove index"
- rm -rf cargo/registry/index/*.
- fi
- echo "Build parity:"
- cargo build --target $PLATFORM --features final --release
- echo "Build evmbin:"
- cargo build --target $PLATFORM --release -p evmbin
- echo "Build ethstore-cli:"
- cargo build --target $PLATFORM --release -p ethstore-cli
- echo "Build ethkey-cli:"
- cargo build --target $PLATFORM --release -p ethkey-cli
- echo "Build whisper-cli:"
- cargo build --target $PLATFORM --release -p whisper-cli
-}
-strip_binaries () {
- echo "Strip binaries:"
- $STRIP_BIN -v target/$PLATFORM/release/parity
- $STRIP_BIN -v target/$PLATFORM/release/parity-evm
- $STRIP_BIN -v target/$PLATFORM/release/ethstore
- $STRIP_BIN -v target/$PLATFORM/release/ethkey
- $STRIP_BIN -v target/$PLATFORM/release/whisper;
-}
-calculate_checksums () {
- echo "Checksum calculation:"
- rhash --version
-
- rm -rf *.sha256
-
- BIN="target/$PLATFORM/release/parity$S3WIN"
- export SHA3="$($BIN tools hash $BIN)"
-
- echo "Parity file SHA3: $SHA3"
- $SHA256_BIN target/$PLATFORM/release/parity$S3WIN > parity$S3WIN.sha256
- $SHA256_BIN target/$PLATFORM/release/parity-evm$S3WIN > parity-evm$S3WIN.sha256
- $SHA256_BIN target/$PLATFORM/release/ethstore$S3WIN > ethstore$S3WIN.sha256
- $SHA256_BIN target/$PLATFORM/release/ethkey$S3WIN > ethkey$S3WIN.sha256
- $SHA256_BIN target/$PLATFORM/release/whisper$S3WIN > whisper$S3WIN.sha256
-}
-sign_exe () {
- ./sign.cmd $keyfile $certpass "target/$PLATFORM/release/parity.exe"
- ./sign.cmd $keyfile $certpass "target/$PLATFORM/release/parity-evm.exe"
- ./sign.cmd $keyfile $certpass "target/$PLATFORM/release/ethstore.exe"
- ./sign.cmd $keyfile $certpass "target/$PLATFORM/release/ethkey.exe"
- ./sign.cmd $keyfile $certpass "target/$PLATFORM/release/whisper.exe"
-}
-push_binaries () {
- echo "Push binaries to AWS S3"
- aws configure set aws_access_key_id $s3_key
- aws configure set aws_secret_access_key $s3_secret
- if [[ "$CI_BUILD_REF_NAME" = "beta" || "$CI_BUILD_REF_NAME" = "stable" || "$CI_BUILD_REF_NAME" = "nightly" ]];
- then
- export S3_BUCKET=builds-parity-published;
- else
- export S3_BUCKET=builds-parity;
- fi
- aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$BUILD_PLATFORM
- aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/parity$S3WIN --body target/$PLATFORM/release/parity$S3WIN
- aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/parity$S3WIN.sha256 --body parity$S3WIN.sha256
- aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/parity-evm$S3WIN --body target/$PLATFORM/release/parity-evm$S3WIN
- aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/parity-evm$S3WIN.sha256 --body parity-evm$S3WIN.sha256
- aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/ethstore$S3WIN --body target/$PLATFORM/release/ethstore$S3WIN
- aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/ethstore$S3WIN.sha256 --body ethstore$S3WIN.sha256
- aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/ethkey$S3WIN --body target/$PLATFORM/release/ethkey$S3WIN
- aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/ethkey$S3WIN.sha256 --body ethkey$S3WIN.sha256
- aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/whisper$S3WIN --body target/$PLATFORM/release/whisper$S3WIN
- aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/whisper$S3WIN.sha256 --body whisper$S3WIN.sha256
-}
-
-make_archive () {
- echo "add artifacts to archive"
- rm -rf parity.zip
- zip -r parity.zip target/$PLATFORM/release/parity$S3WIN target/$PLATFORM/release/parity-evm$S3WIN target/$PLATFORM/release/ethstore$S3WIN target/$PLATFORM/release/ethkey$S3WIN target/$PLATFORM/release/whisper$S3WIN parity$S3WIN.sha256 parity-evm$S3WIN.sha256 ethstore$S3WIN.sha256 ethkey$S3WIN.sha256 whisper$S3WIN.sha256
-}
-
-updater_push_release () {
- echo "push release"
-
- DATA="commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity$S3WIN&secret=$RELEASES_SECRET"
- # Mainnet
- source scripts/safe_curl.sh $DATA "http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$BUILD_PLATFORM"
- # Kovan
- source scripts/safe_curl.sh $DATA "http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$BUILD_PLATFORM"
-}
-
-case $BUILD_PLATFORM in
- x86_64-unknown-linux-gnu)
- #set strip bin
- STRIP_BIN="strip"
- #package extention
- build
- strip_binaries
- calculate_checksums
- make_archive
- push_binaries
- updater_push_release
- ;;
- i686-unknown-linux-gnu)
- STRIP_BIN="strip"
- set_env
- build
- strip_binaries
- calculate_checksums
- make_archive
- push_binaries
- ;;
- armv7-unknown-linux-gnueabihf)
- STRIP_BIN="arm-linux-gnueabihf-strip"
- set_env
- build
- strip_binaries
- calculate_checksums
- make_archive
- push_binaries
- ;;
- arm-unknown-linux-gnueabihf)
- STRIP_BIN="arm-linux-gnueabihf-strip"
- set_env
- build
- strip_binaries
- calculate_checksums
- make_archive
- push_binaries
- ;;
- aarch64-unknown-linux-gnu)
- STRIP_BIN="aarch64-linux-gnu-strip"
- set_env
- build
- strip_binaries
- calculate_checksums
- make_archive
- push_binaries
- ;;
- x86_64-apple-darwin)
- STRIP_BIN="strip"
- PLATFORM="x86_64-apple-darwin"
- build
- strip_binaries
- calculate_checksums
- make_archive
- push_binaries
- updater_push_release
- ;;
- x86_64-unknown-snap-gnu)
- ARC="amd64"
- EXT="snap"
- apt update
- apt install -y expect zip rhash
- snapcraft clean
- echo "Prepare snapcraft.yaml for build on Gitlab CI in Docker image"
- sed -i 's/git/'"$VER"'/g' snap/snapcraft.yaml
- if [[ "$CI_BUILD_REF_NAME" = "stable" || "$CI_BUILD_REF_NAME" = "beta" || "$VER" == *1.11* || "$VER" == *2.0* ]];
- then
- sed -i -e 's/grade: devel/grade: stable/' snap/snapcraft.yaml;
- fi
- mv -f snap/snapcraft.yaml snapcraft.yaml
- snapcraft -d
- snapcraft_login=$(expect -c "
- spawn snapcraft login
- expect \"Email:\"
- send \"$SNAP_EMAIL\n\"
- expect \"Password:\"
- send \"$SNAP_PASS\n\"
- expect \"\$\"
- ")
- echo "$snapcraft_login"
- snapcraft push "parity_"$VER"_amd64.snap"
- snapcraft status parity
- snapcraft logout
- $SHA256_BIN "parity_"$VER"_amd64.snap" > "parity_"$VER"_amd64.snap.sha256"
- echo "add artifacts to archive"
- rm -rf parity.zip
- zip -r parity.zip "parity_"$VER"_amd64.snap" "parity_"$VER"_amd64.snap.sha256"
- ;;
- x86_64-pc-windows-msvc)
- set_env_win
- EXT="exe"
- S3WIN=".exe"
- build
- sign_exe
- calculate_checksums
- make_archive
- push_binaries
- updater_push_release
-esac
diff --git a/scripts/gitlab-push-release.sh b/scripts/gitlab-push-release.sh
deleted file mode 100755
index 207d66c11cb..00000000000
--- a/scripts/gitlab-push-release.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-set -e # fail on any error
-set -u # treat unset variables as error
-
-DATA="secret=$RELEASES_SECRET"
-
-echo "Pushing release to Mainnet"
-./scripts/safe_curl.sh $DATA "http://update.parity.io:1337/push-release/$CI_BUILD_REF_NAME/$CI_BUILD_REF"
-
-echo "Pushing release to Kovan"
-./scripts/safe_curl.sh $DATA "http://update.parity.io:1338/push-release/$CI_BUILD_REF_NAME/$CI_BUILD_REF"
diff --git a/scripts/gitlab-rpc-docs.sh b/scripts/gitlab-rpc-docs.sh
new file mode 100755
index 00000000000..de03fc69f26
--- /dev/null
+++ b/scripts/gitlab-rpc-docs.sh
@@ -0,0 +1,53 @@
+#!/usr/bin/env bash
+
+clone_repos() {
+ git clone https://github.com/parity-js/jsonrpc.git jsonrpc
+ git clone https://github.com/paritytech/wiki.git wiki
+}
+
+build_docs() {
+ npm install
+ npm run build:markdown
+}
+
+update_wiki_docs() {
+ for file in $(ls jsonrpc/docs); do
+ module_name=${file:0:-3}
+ mv jsonrpc/docs/$file wiki/JSONRPC-$module_name-module.md
+ done
+}
+
+set_remote_wiki() {
+ git config remote.origin.url "https://${GITHUB_TOKEN}@github.com/paritytech/wiki.git"
+}
+
+setup_git() {
+ git config --global user.email "devops@parity.com"
+ git config --global user.name "Devops Parity"
+}
+
+commit_files() {
+ git checkout -b rpcdoc-update-${CI_COMMIT_REF_NAME}
+ git add .
+ git commit -m "Update docs to ${CI_COMMIT_REF_NAME}"
+ git tag -a "${CI_COMMIT_REF_NAME}" -m "Updated to ${CI_COMMIT_REF_NAME}"
+}
+
+upload_files() {
+ git push --tags
+}
+
+PROJECT_DIR=$(pwd)
+
+setup_git
+cd ..
+clone_repos
+cp -r $PROJECT_DIR jsonrpc/.parity
+cd jsonrpc
+build_docs
+cd ..
+update_wiki_docs
+cd wiki
+set_remote_wiki
+commit_files
+upload_files
diff --git a/scripts/gitlab-test.sh b/scripts/gitlab-test.sh
deleted file mode 100755
index fbd93167a33..00000000000
--- a/scripts/gitlab-test.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env bash
-#ARGUMENT test for RUST and COVERAGE
-set -e # fail on any error
-set -u # treat unset variables as error
-if [[ "$CI_COMMIT_REF_NAME" = "master" || "$CI_COMMIT_REF_NAME" = "beta" || "$CI_COMMIT_REF_NAME" = "stable" ]]; then
- export GIT_COMPARE=$CI_COMMIT_REF_NAME~;
-else
- export GIT_COMPARE=master;
-fi
-git fetch -a
-export RUST_FILES_MODIFIED="$(git --no-pager diff --name-only $GIT_COMPARE...$CI_COMMIT_SHA | grep -v -e ^\\. -e ^LICENSE -e ^README.md -e ^test.sh -e ^windows/ -e ^scripts/ -e ^mac/ -e ^nsis/ -e ^docs/ | wc -l)"
-echo "RUST_FILES_MODIFIED: $RUST_FILES_MODIFIED"
-TEST_SWITCH=$1
-rust_test () {
- git submodule update --init --recursive
- rustup show
- if [[ "${RUST_FILES_MODIFIED}" == "0" ]];
- then echo "Skipping Rust tests since no Rust files modified.";
- else ./test.sh || exit $?;
- fi
- # if [[ "$CI_COMMIT_REF_NAME" == "nightly" ]];
- # ### @TODO re-enable fail after https://github.com/paritytech/parity-import-tests/issues/3
- # then sh scripts/aura-test.sh; # || exit $?;
- # fi
-}
-coverage_test () {
- git submodule update --init --recursive
- rm -rf target/*
- scripts/cov.sh
-}
-case $TEST_SWITCH in
- stable )
- rustup default stable
- rust_test
- ;;
- beta)
- rustup default beta
- rust_test
- ;;
- nightly)
- rustup default nightly
- rust_test
- ;;
- test-coverage)
- coverage_test
- ;;
-esac
diff --git a/scripts/gitlab/build-unix.sh b/scripts/gitlab/build-unix.sh
new file mode 100755
index 00000000000..50ae7314c3d
--- /dev/null
+++ b/scripts/gitlab/build-unix.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+set -e # fail on any error
+set -u # treat unset variables as error
+echo "__________Show ENVIROMENT__________"
+echo "CC: " $CC
+echo "CXX: " $CXX
+
+echo "__________CARGO CONFIG__________"
+rm -rf .cargo
+mkdir -p .cargo
+echo "[target.$CARGO_TARGET]" >> .cargo/config
+echo "linker= \"$CC\"" >> .cargo/config
+cat .cargo/config
+
+echo "_____ Building target: "$CARGO_TARGET" _____"
+time cargo build --target $CARGO_TARGET --release --features final
+time cargo build --target $CARGO_TARGET --release -p evmbin
+time cargo build --target $CARGO_TARGET --release -p ethstore-cli
+time cargo build --target $CARGO_TARGET --release -p ethkey-cli
+time cargo build --target $CARGO_TARGET --release -p whisper-cli
+
+echo "_____ Post-processing binaries _____"
+rm -rf artifacts
+mkdir -p artifacts
+cd artifacts
+mkdir -p $CARGO_TARGET
+cd $CARGO_TARGET
+cp ../../target/$CARGO_TARGET/release/{parity,parity-evm,ethstore,ethkey,whisper} .
+strip -v ./*
+echo "_____ Calculating checksums _____"
+for binary in $(ls)
+do
+ rhash --sha256 $binary -o $binary.sha256
+done
diff --git a/scripts/gitlab/build-windows.sh b/scripts/gitlab/build-windows.sh
new file mode 100755
index 00000000000..a5510875c87
--- /dev/null
+++ b/scripts/gitlab/build-windows.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+set -e # fail on any error
+set -u # treat unset variables as error
+
+set INCLUDE="C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Include;C:\vs2015\VC\include;C:\Program Files (x86)\Windows Kits\10\Include\10.0.10240.0\ucrt"
+set LIB="C:\vs2015\VC\lib;C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10240.0\ucrt\x64"
+
+rustup default stable-x86_64-pc-windows-msvc
+echo "_____ Building _____"
+time cargo build --target $CARGO_TARGET --release --features final
+time cargo build --target $CARGO_TARGET --release -p evmbin
+time cargo build --target $CARGO_TARGET --release -p ethstore-cli
+time cargo build --target $CARGO_TARGET --release -p ethkey-cli
+time cargo build --target $CARGO_TARGET --release -p whisper-cli
+echo "__________Sign binaries__________"
+scripts/gitlab/sign.cmd $keyfile $certpass target/$CARGO_TARGET/release/parity.exe
+scripts/gitlab/sign.cmd $keyfile $certpass target/$CARGO_TARGET/release/parity-evm.exe
+scripts/gitlab/sign.cmd $keyfile $certpass target/$CARGO_TARGET/release/ethstore.exe
+scripts/gitlab/sign.cmd $keyfile $certpass target/$CARGO_TARGET/release/ethkey.exe
+scripts/gitlab/sign.cmd $keyfile $certpass target/$CARGO_TARGET/release/whisper.exe
+
+echo "_____ Post-processing binaries _____"
+rm -rf artifacts
+mkdir -p artifacts
+cd artifacts
+mkdir -p $CARGO_TARGET
+cd $CARGO_TARGET
+cp --verbose ../../target/$CARGO_TARGET/release/{parity.exe,parity-evm.exe,ethstore.exe,ethkey.exe,whisper.exe} .
+
+echo "_____ Calculating checksums _____"
+for binary in $(ls)
+do
+ rhash --sha256 $binary -o $binary.sha256
+done
+cp parity.exe.sha256 parity.sha256
diff --git a/scripts/gitlab/clippy.sh b/scripts/gitlab/clippy.sh
new file mode 100755
index 00000000000..aef39c29fbc
--- /dev/null
+++ b/scripts/gitlab/clippy.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -e # fail on any error
+set -u # treat unset variables as error
+
+cargo install clippy
+cargo clippy -- -D warnings
diff --git a/scripts/gitlab/coverage.sh b/scripts/gitlab/coverage.sh
new file mode 100755
index 00000000000..1ddf340a180
--- /dev/null
+++ b/scripts/gitlab/coverage.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -x
+git submodule update --init --recursive
+rm -rf target/*
+cargo test --all --exclude evmjit --no-run -- --test-threads 8|| exit $?
+KCOV_TARGET="target/cov"
+KCOV_FLAGS="--verify"
+EXCLUDE="/usr/lib,/usr/include,$HOME/.cargo,$HOME/.multirust,rocksdb,secp256k1"
+mkdir -p $KCOV_TARGET
+echo "__________Cover RUST___________"
+for FILE in `find target/debug/deps ! -name "*.*"`
+ do
+ timeout --signal=SIGKILL 5m kcov --exclude-pattern $EXCLUDE $KCOV_FLAGS $KCOV_TARGET $FILE
+ done
+timeout --signal=SIGKILL 5m kcov --exclude-pattern $EXCLUDE $KCOV_FLAGS $KCOV_TARGET target/debug/parity-*
+echo "Cover JS"
+bash <(curl -s https://codecov.io/bash)&&
+echo "Uploaded code coverage"
+exit 0
diff --git a/scripts/gitlab/install-readme.sh b/scripts/gitlab/install-readme.sh
new file mode 100755
index 00000000000..531bae9b77a
--- /dev/null
+++ b/scripts/gitlab/install-readme.sh
@@ -0,0 +1,8 @@
+echo "Parity Wallet
+=============
+
+Welcome to Parity Wallet, your all-in-one Ethereum node and wallet.
+
+If you continue, Parity will be installed as a user service. You will be able to use the Parity Wallet through your browser by using the menu bar icon, following the shortcut in the Launchpad or navigating to http://localhost:8180/ in your browser.
+
+Parity is distributed under the terms of the GPL."
diff --git a/scripts/gitlab/package-snap.sh b/scripts/gitlab/package-snap.sh
new file mode 100755
index 00000000000..168ab475155
--- /dev/null
+++ b/scripts/gitlab/package-snap.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+set -e # fail on any error
+set -u # treat unset variables as error
+case ${CI_COMMIT_REF_NAME} in
+ nightly|*v2.1*) export GRADE="devel";;
+ beta|*v2.0*) export GRADE="stable";;
+ stable|*v1.11*) export GRADE="stable";;
+ *) echo "No release" exit 0;;
+esac
+SNAP_PACKAGE="parity_"$VERSION"_"$BUILD_ARCH".snap"
+echo "__________Create snap package__________"
+echo "Release channel :" $GRADE " Branch/tag: " $CI_COMMIT_REF_NAME
+snapcraft clean
+echo $VERSION:$GRADE:$BUILD_ARCH
+cat scripts/gitlab/templates/snapcraft.template.yaml | envsubst '$VERSION:$GRADE:$BUILD_ARCH:$CARGO_TARGET' > snapcraft.yaml
+cat snapcraft.yaml
+snapcraft --target-arch=$BUILD_ARCH
+ls *.snap
+echo "__________Post-processing snap package__________"
+mkdir -p artifacts
+mv -v $SNAP_PACKAGE "artifacts/"$SNAP_PACKAGE
+echo "_____ Calculating checksums _____"
+cd artifacts
+rhash --sha256 $SNAP_PACKAGE -o $SNAP_PACKAGE".sha256"
diff --git a/scripts/gitlab/publish-docker.sh b/scripts/gitlab/publish-docker.sh
new file mode 100755
index 00000000000..41c2e3db48a
--- /dev/null
+++ b/scripts/gitlab/publish-docker.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+##ARGUMENTS: 1. Docker target
+set -e # fail on any error
+set -u # treat unset variables as error
+
+if [ "$CI_COMMIT_REF_NAME" == "beta" ];
+then export DOCKER_BUILD_TAG="latest";
+else export DOCKER_BUILD_TAG=$CI_COMMIT_REF_NAME;
+fi
+docker login -u $Docker_Hub_User_Parity -p $Docker_Hub_Pass_Parity
+
+echo "__________Docker TAG__________"
+echo $DOCKER_BUILD_TAG
+
+echo "__________Docker target__________"
+export DOCKER_TARGET=$1
+echo $DOCKER_TARGET
+
+echo "__________Docker build and push__________"
+docker build --build-arg TARGET=$DOCKER_TARGET --no-cache=true --tag parity/$DOCKER_TARGET:$DOCKER_BUILD_TAG -f docker/hub/Dockerfile .
+docker push parity/$DOCKER_TARGET:$DOCKER_BUILD_TAG
+docker logout
diff --git a/scripts/gitlab/publish-snap.sh b/scripts/gitlab/publish-snap.sh
new file mode 100755
index 00000000000..35644c8d754
--- /dev/null
+++ b/scripts/gitlab/publish-snap.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e # fail on any error
+set -u # treat unset variables as error
+
+case ${CI_COMMIT_REF_NAME} in
+ nightly|*v2.1*) export CHANNEL="edge";;
+ beta|*v2.0*) export CHANNEL="beta";;
+ stable|*v1.11*) export CHANNEL="stable";;
+ *) echo "No release" exit 0;;
+esac
+echo "Release channel :" $CHANNEL " Branch/tag: " $CI_COMMIT_REF_NAME
+
+echo $SNAPCRAFT_LOGIN_PARITY_BASE64 | base64 --decode > snapcraft.login
+snapcraft login --with snapcraft.login
+snapcraft push --release $CHANNEL "artifacts/parity_"$VERSION"_"$BUILD_ARCH".snap"
+snapcraft status parity
+snapcraft logout
diff --git a/scripts/gitlab/push.sh b/scripts/gitlab/push.sh
new file mode 100755
index 00000000000..718f291fe1f
--- /dev/null
+++ b/scripts/gitlab/push.sh
@@ -0,0 +1,67 @@
+#!/bin/bash
+
+set -e # fail on any error
+set -u # treat unset variables as error
+updater_push_release () {
+ echo "push release"
+ # Mainnet
+
+}
+echo "__________Set ENVIROMENT__________"
+DESCRIPTION="$(cat CHANGELOG.md)"
+RELEASE_TABLE="$(cat scripts/gitlab/templates/release-table.md)"
+RELEASE_TABLE="$(echo "${RELEASE_TABLE//\$VERSION/${VERSION}}")"
+#The text in the file CANGELOG.md before which the table with links is inserted. Must be present in this file necessarily
+REPLACE_TEXT="The full list of included changes:"
+case ${CI_COMMIT_REF_NAME} in
+ nightly|*v2.1*) NAME="Parity "$VERSION" nightly";;
+ beta|*v2.0*) NAME="Parity "$VERSION" beta";;
+ stable|*v1.11*) NAME="Parity "$VERSION" stable";;
+ *) echo "No release" exit 0;;
+esac
+cd artifacts
+ls -l | sort -k9
+filetest=( * )
+echo ${filetest[*]}
+for DIR in "${filetest[@]}";
+do
+ cd $DIR
+ if [[ $DIR == "*windows*" ]];
+ then
+ WIN=".exe";
+ else
+ WIN="";
+ fi
+ for binary in $(ls parity.sha256)
+ do
+ sha256=$(cat $binary | awk '{ print $1}' )
+ case $DIR in
+ x86_64* )
+ DATA="commit=$CI_BUILD_REF&sha3=$sha256&filename=parity$WIN&secret=$RELEASES_SECRET"
+ ../../scripts/gitlab/safe_curl.sh $DATA "http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$DIR"
+ # Kovan
+ ../../scripts/gitlab/safe_curl.sh $DATA "http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$DIR"
+ ;;
+ esac
+ RELEASE_TABLE="$(echo "${RELEASE_TABLE/sha$DIR/${sha256}}")"
+ done
+ cd ..
+done
+#do not touch the following 3 lines. Features of output in Markdown
+DESCRIPTION="$(echo "${DESCRIPTION/${REPLACE_TEXT}/${RELEASE_TABLE}
+
+${REPLACE_TEXT}}")"
+echo "$DESCRIPTION"
+if [["$CI_COMMIT_REF_NAME" == "nightly" ]]; then DESCRIPTION=""; fi #TODO in the future, we need to prepare a script that will do changelog
+echo "__________Create release to Github____________"
+github-release release --user devops-parity --repo parity-ethereum --tag "$CI_COMMIT_REF_NAME" --draft --name "$NAME" --description "$DESCRIPTION"
+echo "__________Push binaries to AWS S3____________"
+aws configure set aws_access_key_id $s3_key
+aws configure set aws_secret_access_key $s3_secret
+if [[ "$CI_BUILD_REF_NAME" = "beta" || "$CI_BUILD_REF_NAME" = "stable" || "$CI_BUILD_REF_NAME" = "nightly" ]];
+ then
+ export S3_BUCKET=builds-parity-published;
+ else
+ export S3_BUCKET=builds-parity;
+fi
+aws s3 sync ./ s3://$S3_BUCKET/$CI_BUILD_REF_NAME/
diff --git a/scripts/gitlab/rpc-docs.sh b/scripts/gitlab/rpc-docs.sh
new file mode 100755
index 00000000000..a01ab1280be
--- /dev/null
+++ b/scripts/gitlab/rpc-docs.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+set -e # fail on any error
+set -u # treat unset variables as error
+
+clone_repos() {
+ echo "__________Clone repos__________"
+ git clone https://github.com/parity-js/jsonrpc.git jsonrpc
+ git clone https://github.com/paritytech/wiki.git wiki
+}
+
+build_docs() {
+ echo "__________Build docs__________"
+ npm install
+ npm run build:markdown
+}
+
+update_wiki_docs() {
+ echo "__________Update WIKI docs__________"
+ for file in $(ls jsonrpc/docs); do
+ module_name=${file:0:-3}
+ mv jsonrpc/docs/$file wiki/JSONRPC-$module_name-module.md
+ done
+}
+
+setup_git() {
+ echo "__________Set github__________"
+ git config user.email "devops@parity.com"
+ git config user.name "Devops Parity"
+}
+
+commit_files() {
+ echo "__________Commit files__________"
+ git checkout -b rpcdoc-update-${CI_COMMIT_REF_NAME}
+ git add .
+ git commit -m "Update docs to ${CI_COMMIT_REF_NAME}"
+ git tag -a "${CI_COMMIT_REF_NAME}"
+}
+
+upload_files() {
+ echo "__________Upload files__________"
+ git push --tags
+}
+
+setup_git
+clone_repos
+cp -r parity/ jsonrpc/.parity/
+cd jsonrpc
+build_docs
+cd ..
+update_wiki_docs
+cd wiki
+commit_files
+upload_files
diff --git a/scripts/gitlab/rustfmt.sh b/scripts/gitlab/rustfmt.sh
new file mode 100755
index 00000000000..447d66f24ec
--- /dev/null
+++ b/scripts/gitlab/rustfmt.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -e # fail on any error
+set -u # treat unset variables as error
+
+cargo install rustfmt-nightly
+cargo fmt -- --write-mode=diff
diff --git a/scripts/safe_curl.sh b/scripts/gitlab/safe_curl.sh
similarity index 100%
rename from scripts/safe_curl.sh
rename to scripts/gitlab/safe_curl.sh
diff --git a/scripts/gitlab/sign.cmd b/scripts/gitlab/sign.cmd
new file mode 100755
index 00000000000..2b014a0236c
--- /dev/null
+++ b/scripts/gitlab/sign.cmd
@@ -0,0 +1 @@
+@signtool sign /f %1 /p %2 /tr http://timestamp.comodoca.com /du https://parity.io %3
diff --git a/scripts/gitlab/templates/release-table.md b/scripts/gitlab/templates/release-table.md
new file mode 100644
index 00000000000..6145521524e
--- /dev/null
+++ b/scripts/gitlab/templates/release-table.md
@@ -0,0 +1,16 @@
+| OS | Arch | Download | SHA256 Checksum |
+|:---:|:---:|:---|:---|
+| linux | arm64 | [parity](https://releases.parity.io/$VERSION/aarch64-unknown-linux-gnu/parity) | `shaaarch64-unknown-linux-gnu` |
+| android | armv7 | [parity](https://releases.parity.io/$VERSION/armv7-linux-androideabi/parity) | `shaarmv7-linux-androideabi` |
+| linux | armv7 | [parity](https://releases.parity.io/$VERSION/armv7-unknown-linux-gnueabihf/parity) | `shaarmv7-unknown-linux-gnueabihf` |
+| linux | i686 | [parity](https://releases.parity.io/$VERSION/i686-unknown-linux-gnu/parity) | `shai686-unknown-linux-gnu` |
+| osx | x64 | [parity](https://releases.parity.io/$VERSION/x86_64-apple-darwin/parity) | `shax86_64-apple-darwin` |
+| windows | x64 | [parity.exe](https://releases.parity.io/$VERSION/x86_64-pc-windows-msvc/parity.exe) | `shax86_64-pc-windows-msvc` |
+| linux | x64 | [parity](https://releases.parity.io/$VERSION/x86_64-unknown-linux-gnu/parity) | `shax86_64-unknown-linux-gnu` |
+
+| OS | Alternative | Link |
+|:---:|:---:|:---|
+|
| Homebrew |[github.com/paritytech/homebrew-paritytech/blob/master/README.md](https://github.com/paritytech/homebrew-paritytech/blob/master/README.md) |
+| 
| Snapcraft | [snapcraft.io/parity](https://snapcraft.io/parity/) |
+| 
| Docker | [hub.docker.com/r/parity/parity](https://hub.docker.com/r/parity/parity) |
+| | Other binaries | [vanity-service.parity.io/parity-binaries?format=markdown&version=$VERSION](https://vanity-service.parity.io/parity-binaries?format=markdown&version=$VERSION) |
diff --git a/scripts/gitlab/templates/snapcraft.template.yaml b/scripts/gitlab/templates/snapcraft.template.yaml
new file mode 100644
index 00000000000..97bb39aa14a
--- /dev/null
+++ b/scripts/gitlab/templates/snapcraft.template.yaml
@@ -0,0 +1,58 @@
+name: parity
+version: $VERSION
+architectures: [$BUILD_ARCH]
+grade: $GRADE
+confinement: strict
+
+summary: Fast, light, robust Ethereum implementation
+description: |
+ Parity's goal is to be the fastest, lightest, and most secure Ethereum
+ client. We are developing Parity using the sophisticated and cutting-edge
+ Rust programming language. Parity is licensed under the GPLv3, and can be
+ used for all your Ethereum needs.
+
+
+apps:
+ parity:
+ command: parity
+ plugs: [home, network, network-bind, mount-observe, x11, unity7, desktop, desktop-legacy, wayland]
+ desktop: usr/share/applications/parity.desktop
+ parity-evm:
+ command: parity-evm
+ plugs: [home, network, network-bind]
+ ethkey:
+ command: ethkey
+ plugs: [home]
+ ethstore:
+ command: ethstore
+ plugs: [home]
+ whisper:
+ command: whisper
+ plugs: [home]
+
+icon: snap/gui/icon.png
+
+parts:
+ desktop-icon:
+ source: ./snap
+ plugin: nil
+ override-build: |
+ mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/applications
+ mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps
+ cp -v gui/parity.desktop $SNAPCRAFT_PART_INSTALL/usr/share/applications/
+ cp -v gui/icon.png $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps/
+ parity:
+ source: ./artifacts/$CARGO_TARGET
+ plugin: nil
+ override-build: |
+ mkdir -p $SNAPCRAFT_PART_INSTALL/usr/bin
+ cp -v parity $SNAPCRAFT_PART_INSTALL/usr/bin/parity
+ cp -v parity-evm $SNAPCRAFT_PART_INSTALL/usr/bin/parity-evm
+ cp -v ethkey $SNAPCRAFT_PART_INSTALL/usr/bin/ethkey
+ cp -v ethstore $SNAPCRAFT_PART_INSTALL/usr/bin/ethstore
+ cp -v whisper $SNAPCRAFT_PART_INSTALL/usr/bin/whisper
+ stage-packages: [libc6, libssl1.0.0, libudev1, libstdc++6, cmake]
+ df:
+ plugin: nil
+ stage-packages: [coreutils]
+ stage: [bin/df]
diff --git a/scripts/gitlab/test.sh b/scripts/gitlab/test.sh
new file mode 100755
index 00000000000..be48c52cca8
--- /dev/null
+++ b/scripts/gitlab/test.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+# ARGUMENT $1 Rust flavor to test with (stable/beta/nightly)
+
+set -e # fail on any error
+set -u # treat unset variables as error
+
+rustup default $1
+
+if [[ "$CI_COMMIT_REF_NAME" = "beta" || "$CI_COMMIT_REF_NAME" = "stable" ]]; then
+ export GIT_COMPARE=$CI_COMMIT_REF_NAME~;
+else
+ export GIT_COMPARE=master;
+fi
+
+export RUST_FILES_MODIFIED="$(git --no-pager diff --name-only $GIT_COMPARE...$CI_COMMIT_SHA | grep -v -e ^\\. -e ^LICENSE -e ^README.md -e ^test.sh -e ^windows/ -e ^scripts/ -e ^mac/ -e ^nsis/ | wc -l)"
+echo "RUST_FILES_MODIFIED: $RUST_FILES_MODIFIED"
+
+git submodule update --init --recursive
+rustup show
+if [[ "${RUST_FILES_MODIFIED}" == "0" ]];
+then echo "__________Skipping Rust tests since no Rust files modified__________";
+else ./test.sh || exit $?;
+fi
+
+# if [[ "$CI_COMMIT_REF_NAME" == "nightly" ]];
+# ### @TODO re-enable fail after https://github.com/paritytech/parity-import-tests/issues/3
+# then sh scripts/aura-test.sh; # || exit $?;
+# fi
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
deleted file mode 100644
index c7da2396002..00000000000
--- a/snap/snapcraft.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-name: parity
-version: git
-summary: Fast, light, robust Ethereum implementation
-description: |
- Parity's goal is to be the fastest, lightest, and most secure Ethereum
- client. We are developing Parity using the sophisticated and cutting-edge
- Rust programming language. Parity is licensed under the GPLv3, and can be
- used for all your Ethereum needs.
-
-grade: devel
-confinement: strict
-
-apps:
- parity:
- command: parity
- plugs: [home, network, network-bind, mount-observe, x11, unity7, desktop, desktop-legacy, wayland]
- desktop: usr/share/applications/parity.desktop
-
-icon: snap/gui/icon.png
-
-parts:
- desktop-icon:
- source: ./snap
- plugin: nil
- prepare: |
- mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/applications
- mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps
- cp -v gui/parity.desktop $SNAPCRAFT_PART_INSTALL/usr/share/applications/
- cp -v gui/icon.png $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps/
- parity:
- source: .
- plugin: rust
- # rust-channel: stable # @TODO enable after https://bugs.launchpad.net/snapcraft/+bug/1778530
- rust-revision: 1.26.2 # @TODO remove after https://bugs.launchpad.net/snapcraft/+bug/1778530
- build-attributes: [no-system-libraries]
- build-packages: [g++, libudev-dev, make, pkg-config, cmake]
- stage-packages: [libc6, libudev1, libstdc++6]
- df:
- plugin: nil
- stage-packages: [coreutils]
- stage: [bin/df]
diff --git a/test.sh b/test.sh
index 82e05d954c5..baa959f3cb4 100755
--- a/test.sh
+++ b/test.sh
@@ -32,13 +32,13 @@ set -e
if [ "$VALIDATE" -eq "1" ]; then
# Validate --no-default-features build
echo "________Validate build________"
-cargo check --no-default-features
-cargo check --manifest-path util/io/Cargo.toml --no-default-features
-cargo check --manifest-path util/io/Cargo.toml --features "mio"
+time cargo check --no-default-features
+time cargo check --manifest-path util/io/Cargo.toml --no-default-features
+time cargo check --manifest-path util/io/Cargo.toml --features "mio"
# Validate chainspecs
echo "________Validate chainspecs________"
-./scripts/validate_chainspecs.sh
+time ./scripts/validate_chainspecs.sh
fi
@@ -57,4 +57,4 @@ cd parity-clib-examples/cpp && \
# Running tests
echo "________Running Parity Full Test Suite________"
git submodule update --init --recursive
-cargo test -j 8 $OPTIONS --features "$FEATURES" --all $1
+time cargo test $OPTIONS --features "$FEATURES" --all $1 -- --test-threads 8
+
+
+