From 5ee54b72989936db4e43ab6458421ab5624341f3 Mon Sep 17 00:00:00 2001
From: Niklas Adolfsson <niklasadolfsson1@gmail.com>
Date: Wed, 2 Oct 2019 12:23:20 +0200
Subject: [PATCH] [stable]: backports (#11114)

* [spec] fix rinkeby spec (#11108)

* use images from our registry (#11105)
---
 .gitlab-ci.yml                    | 15 ++++++++-------
 ethcore/res/ethereum/rinkeby.json |  3 +++
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e5bcd9596..d8ed96f22 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ stages:
   - publish
   - optional
 
-image:                             parity/parity-ci-linux:latest
+image:                             ${REGISTRY}/parity-ci-linux:latest
 variables:
   GIT_STRATEGY:                    fetch
   GIT_SUBMODULE_STRATEGY:          recursive
@@ -12,6 +12,7 @@ variables:
   CARGO_HOME:                      "/ci-cache/${CI_PROJECT_NAME}/cargo/${CI_JOB_NAME}"
   SCCACHE_DIR:                     "/ci-cache/${CI_PROJECT_NAME}/sccache"
   CARGO_TARGET:                    x86_64-unknown-linux-gnu
+  REGISTRY:                        registry.parity.io/parity/infrastructure/scripts
 
 
 .releaseable_branches:             # list of git refs for building GitLab artifacts (think "pre-release binaries")
@@ -143,7 +144,7 @@ test-linux-nightly:
 
 build-android:
   <<:                              *build-on-linux
-  image:                           parity/parity-ci-android:stretch
+  image:                           ${REGISTRY}/parity-ci-android:stretch
   variables:
     CARGO_TARGET:                  armv7-linux-androideabi
 
@@ -154,21 +155,21 @@ build-linux:
 build-linux-i386:
   <<:                              *build-on-linux
   only:                            *releaseable_branches
-  image:                           parity/parity-ci-i386:latest
+  image:                           ${REGISTRY}/parity-ci-i386:latest
   variables:
     CARGO_TARGET:                  i686-unknown-linux-gnu
 
 build-linux-arm64:
   <<:                              *build-on-linux
   only:                            *releaseable_branches
-  image:                           parity/parity-ci-arm64:latest
+  image:                           ${REGISTRY}/parity-ci-arm64:latest
   variables:
     CARGO_TARGET:                  aarch64-unknown-linux-gnu
 
 build-linux-armhf:
   <<:                              *build-on-linux
   only:                            *releaseable_branches
-  image:                           parity/parity-ci-armhf:latest
+  image:                           ${REGISTRY}/parity-ci-armhf:latest
   variables:
     CARGO_TARGET:                  armv7-unknown-linux-gnueabihf
 
@@ -307,7 +308,7 @@ publish-onchain-manually:
   when:                            manual
 
 publish-release-awss3-nightly:     &publish-release-awss3
-  image:                           parity/awscli:latest
+  image:                           ${REGISTRY}/awscli:latest
   stage:                           publish
   only:
     - nightly
@@ -341,7 +342,7 @@ publish-release-awss3-manually:
 
 publish-docs:
   stage:                           publish
-  image:                           parity/parity-ci-docs:latest
+  image:                           ${REGISTRY}/parity-ci-docs:latest
   only:
     - tags
   except:
diff --git a/ethcore/res/ethereum/rinkeby.json b/ethcore/res/ethereum/rinkeby.json
index 3945b8811..790d6d33e 100644
--- a/ethcore/res/ethereum/rinkeby.json
+++ b/ethcore/res/ethereum/rinkeby.json
@@ -122,6 +122,7 @@
 			}
 		},
 		"0x0000000000000000000000000000000000000006": {
+			"balance": "0x1",
 			"builtin": {
 				"name": "alt_bn128_add",
 				"activate_at": "0xfcc25",
@@ -135,6 +136,7 @@
 			}
 		},
 		"0x0000000000000000000000000000000000000007": {
+			"balance": "0x1",
 			"builtin": {
 				"name": "alt_bn128_mul",
 				"activate_at": "0xfcc25",
@@ -148,6 +150,7 @@
 			}
 		},
 		"0x0000000000000000000000000000000000000008": {
+			"balance": "0x1",
 			"builtin": {
 				"name": "alt_bn128_pairing",
 				"activate_at": "0xfcc25",