diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c86724231..4800eaa57 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -184,6 +184,7 @@ docker-build: stage: build only: - tags + - master - beta - stable - triggers diff --git a/Cargo.lock b/Cargo.lock index 42108cfa6..ff8296b96 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1875,7 +1875,7 @@ dependencies = [ [[package]] name = "parity" -version = "1.10.7" +version = "1.10.8" dependencies = [ "ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.29.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1923,7 +1923,7 @@ dependencies = [ "parity-rpc 1.9.0", "parity-rpc-client 1.4.0", "parity-updater 1.9.0", - "parity-version 1.10.7", + "parity-version 1.10.8", "parity-whisper 0.1.0", "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", "path 0.1.0", @@ -1972,7 +1972,7 @@ dependencies = [ "parity-reactor 0.1.0", "parity-ui 1.9.0", "parity-ui-deprecation 1.10.0", - "parity-version 1.10.7", + "parity-version 1.10.8", "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2123,7 +2123,7 @@ dependencies = [ "order-stat 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "parity-reactor 0.1.0", "parity-updater 1.9.0", - "parity-version 1.10.7", + "parity-version 1.10.8", "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", "pretty_assertions 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2240,7 +2240,7 @@ dependencies = [ "ethsync 1.9.0", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "parity-hash-fetch 1.9.0", - "parity-version 1.10.7", + "parity-version 1.10.8", "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", "path 0.1.0", "semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2249,7 +2249,7 @@ dependencies = [ [[package]] name = "parity-version" -version = "1.10.7" +version = "1.10.8" dependencies = [ "ethcore-bytes 0.1.0", "rlp 0.2.1", diff --git a/Cargo.toml b/Cargo.toml index 3029c9c78..833f1aa93 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ description = "Parity Ethereum client" name = "parity" # NOTE Make sure to update util/version/Cargo.toml as well -version = "1.10.7" +version = "1.10.8" license = "GPL-3.0" authors = ["Parity Technologies "] diff --git a/ethcore/res/ethereum/ropsten.json b/ethcore/res/ethereum/ropsten.json index 6aad92505..6abbeff74 100644 --- a/ethcore/res/ethereum/ropsten.json +++ b/ethcore/res/ethereum/ropsten.json @@ -26,8 +26,8 @@ "maximumExtraDataSize": "0x20", "minGasLimit": "0x1388", "networkID" : "0x3", - "forkBlock": 641350, - "forkCanonHash": "0x8033403e9fe5811a7b6d6b469905915de1c59207ce2172cbcf5d6ff14fa6a2eb", + "forkBlock": 3383558, + "forkCanonHash": "0x6b4b80d65951375a70bc1ecf9a270d152dd355454d57869abbae2e42c213e0f3", "maxCodeSize": 24576, "maxCodeSizeTransition": 10, "eip155Transition": 10, diff --git a/mac/Parity.pkgproj b/mac/Parity.pkgproj index 371919ebf..4b80578ee 100755 --- a/mac/Parity.pkgproj +++ b/mac/Parity.pkgproj @@ -462,7 +462,7 @@ OVERWRITE_PERMISSIONS VERSION - 1.10.7 + 1.10.8 UUID 2DCD5B81-7BAF-4DA1-9251-6274B089FD36 diff --git a/nsis/installer.nsi b/nsis/installer.nsi index 93242b188..554bca3a2 100644 --- a/nsis/installer.nsi +++ b/nsis/installer.nsi @@ -10,7 +10,7 @@ !define DESCRIPTION "Fast, light, robust Ethereum implementation" !define VERSIONMAJOR 1 !define VERSIONMINOR 10 -!define VERSIONBUILD 7 +!define VERSIONBUILD 8 !define ARGS "" !define FIRST_START_ARGS "--mode=passive ui" diff --git a/rpc/src/v1/helpers/fake_sign.rs b/rpc/src/v1/helpers/fake_sign.rs index 84a225d81..97cb6bce7 100644 --- a/rpc/src/v1/helpers/fake_sign.rs +++ b/rpc/src/v1/helpers/fake_sign.rs @@ -15,7 +15,6 @@ // along with Parity. If not, see . use transaction::{Transaction, SignedTransaction, Action}; -use ethereum_types::U256; use jsonrpc_core::Error; use v1::helpers::CallRequest; @@ -29,7 +28,7 @@ pub fn sign_call(request: CallRequest, gas_cap: bool) -> Result gas, None if gas_cap => max_gas, - None => U256::from(2) << 50, + None => max_gas * 10, }; let from = request.from.unwrap_or(0.into()); diff --git a/scripts/docker-build.sh b/scripts/docker-build.sh index ceb085f51..1adb49c1d 100755 --- a/scripts/docker-build.sh +++ b/scripts/docker-build.sh @@ -2,6 +2,10 @@ cd docker/hub DOCKER_BUILD_TAG=$1 echo "Docker build tag: " $DOCKER_BUILD_TAG -docker build --build-arg BUILD_TAG=$DOCKER_BUILD_TAG --no-cache=true --tag parity/parity:$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 index c37d7c94a..ad3ae6968 100755 --- a/scripts/gitlab-build.sh +++ b/scripts/gitlab-build.sh @@ -157,6 +157,9 @@ make_pkg () { } 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" } make_exe () { ./msbuild.cmd @@ -198,6 +201,7 @@ push_binaries () { aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/"parity_"$VER"_"$IDENT"_"$ARC"."$EXT".md5" --body "parity_"$VER"_"$IDENT"_"$ARC"."$EXT".md5" aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/"parity_"$VER"_"$IDENT"_"$ARC"."$EXT".sha256" --body "parity_"$VER"_"$IDENT"_"$ARC"."$EXT".sha256" } + make_archive () { echo "add artifacts to archive" rm -rf parity.zip @@ -314,7 +318,7 @@ case $BUILD_PLATFORM in 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" || "$VER" == *1.10* ]]; + if [[ "$CI_BUILD_REF_NAME" = "stable" || "$CI_BUILD_REF_NAME" = "beta" || "$VER" == *1.10* || "$VER" == *1.11* ]]; then sed -i -e 's/grade: devel/grade: stable/' snap/snapcraft.yaml; fi diff --git a/util/version/Cargo.toml b/util/version/Cargo.toml index 33365b8d2..190b05420 100644 --- a/util/version/Cargo.toml +++ b/util/version/Cargo.toml @@ -3,7 +3,7 @@ [package] name = "parity-version" # NOTE: this value is used for Parity version string (via env CARGO_PKG_VERSION) -version = "1.10.7" +version = "1.10.8" authors = ["Parity Technologies "] build = "build.rs"