Merge branch 'preimage-hotfix' into 'master'

Preimage hotfix

See merge request energi/tech/core/energi!451

.gitlab-ci.yml

@@ -78,7 +78,7 @@ branch-check:
   cache: []
   extends: .merge-request-job
   script:
-    - if [[ "$(git merge origin/develop)" != "Already up to date." ]]; then echo "[Error] branch is not up to date with develop"; exit 1; fi
+    - if [[ "${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}" != "master" && "$(git merge origin/develop)" != "Already up to date." ]]; then echo "[Error] branch is not up to date with develop"; exit 1; fi
 
 #lint-go:
 #  stage: lint

energi/exceptions/preimage_exceptions.go

@@ -23,7 +23,7 @@ var (
 
 const (
   // block number when we stop using exception and get back to preimate database
-  exceptionEndBlockNum = 693000
+  exceptionEndBlockNum = 5000000
 )
 
 

energi/params/checkpoints.go

@@ -31,6 +31,7 @@ var EnergiCheckpoints = map[common.Hash]map[uint64]common.Hash{
 		uint64(325054): common.HexToHash("0x9d33948d3411b8276696e2a4422b412830a4083082d523463bd79ab572803ddd"),
 		uint64(563400): common.HexToHash("0xfc5725db1869a1ca7a19769e376c826792719fe8d361f5fc9d8407725faae3f5"),
 		uint64(765780): common.HexToHash("0x265f3b69f31a6f077db1acd84680dd8177eedbd7167b510997cfaa92fd31358c"),
+		uint64(1555623): common.HexToHash("0xeb1cc9479194d085eab9bb16ceae5aeec547f6216fe5b68596fde5b5e13ed018"),
 	},
 	eth_params.TestnetGenesisHash: {
 		uint64(100000):  common.HexToHash("0x581e691b64ffbec38b484796377581443ada724db6fbeb6e611573fbea04ecd2"),

params/version.go

@@ -20,9 +20,9 @@ package params
 import "fmt"
 
 const (
-	VersionMajor = 3        // Major version component of the current release
+	VersionMajor = 1        // Major version component of the current release
 	VersionMinor = 1        // Minor version component of the current release
-	VersionPatch = 3        // Patch version component of the current release
+	VersionPatch = 4        // Patch version component of the current release
 	VersionMeta  = "stable" // Version metadata to append to the version string
 )