Bump stable to 1.10.8 (#8951)

* parity-version: bump stable to 1.10.8 * Update ropsten.json (#8926) * Update hardcoded headers (#8925) * Update kovan.json Update Kovan to block 7693549 * Update foundation.json Updated to block #5812225 * Update ropsten.json Update to 3465217 * Update ropsten.json use tabs * Update foundation.json use tabs * Update kovan.json use tabs * scripts: minor improvements (#8930) * CI: enable 'latest' docker tag on master pipeline * CI: mark both beta and stable as stable snap. * CI: sign all windows binaries * scripts: remove whisper target not available in stable * Revert "Update hardcoded headers (#8925)" This reverts commit e1dc515. * scripts: fix gitlab strip binaries * scripts: fix docker build tag on latest using master (#8952) * rpc: cap gas limit of local calls (#8943)
openethereum · Jun 22, 2018 · 6438fe9 · 6438fe9
1 parent ba79cad
commit 6438fe9
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 16 deletions.
diff --git 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
diff --git 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 <admin@parity.io>"]
 

diff --git 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
@@ -462,7 +462,7 @@
 				<key>OVERWRITE_PERMISSIONS</key>
 				<false/>
 				<key>VERSION</key>
-				<string>1.10.7</string>
+				<string>1.10.8</string>
 			</dict>
 			<key>UUID</key>
 			<string>2DCD5B81-7BAF-4DA1-9251-6274B089FD36</string>

diff --git 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
@@ -15,7 +15,6 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 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<SignedTransactio
 		}
 		Some(gas) => 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
@@ -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
@@ -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
@@ -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 <admin@parity.io>"]
 build = "build.rs"