Merge pull request #38 from HorizenOfficial/TOOLS-2310

feat: zen 4.1.0-rc1 (deprecates shielded txs)
HorizenOfficial · Aug 7, 2023 · 9298b95 · 9298b95
2 parents a4adca0 + b6e6036
commit 9298b95
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,7 +16,7 @@ env:
     - ALLOW_FAIL=false
     - ROSETTA_MAINTAINER_KEYS="9af032ddb86abfc05c9f261e1f8915d9c94236ba 8f94311b0d7422b170ae0cc271ba5ca94e686cf7 219f55740bbf7a1ce368ba45fb7053ce4991b669 FC3388A460ACFAB04E8328C07BB2A1D2CFDFCD2C"
     - ZEND_MAINTAINER_KEYS="219f55740bbf7a1ce368ba45fb7053ce4991b669 FC3388A460ACFAB04E8328C07BB2A1D2CFDFCD2C D0459BD6AAD14E8D9C83FF1E8EDE560493C65AC1 661F6FC64773A0F47936625FD3A22623FF9B9F11 BF1FCDC8AEE7AE53013FF0941FCA7260796CB902"
-    - ZEN_COMMITTISH=v4.0.0-rc3
+    - ZEN_COMMITTISH=v4.1.0-rc1
 
 # TODO remove || true
 install: make deps || true

diff --git a/Dockerfile b/Dockerfile
@@ -14,14 +14,14 @@
 # limitations under the License.
 
 ## Build zend
-FROM ubuntu:18.04 as zend-builder
+FROM ubuntu:20.04 as zend-builder
 
 MAINTAINER cronic@horizen.io
 
 SHELL ["/bin/bash", "-c"]
 
-# Latest release zen 4.0.0
-ARG ZEN_COMMITTISH=v4.0.0
+# Latest release zen 4.1.0-rc1
+ARG ZEN_COMMITTISH=v4.1.0-rc1
 ARG IS_RELEASE=false
 # cronic <cronic@zensystem.io> https://keys.openpgp.org/vks/v1/by-fingerprint/219F55740BBF7A1CE368BA45FB7053CE4991B669
 # Luigi Varriale <luigi@horizenlabs.io> https://keys.openpgp.org/vks/v1/by-fingerprint/FC3388A460ACFAB04E8328C07BB2A1D2CFDFCD2C
@@ -60,7 +60,7 @@ RUN set -euxo pipefail \
 
 
 ## Build Rosetta Server Components
-FROM ubuntu:18.04 as rosetta-builder
+FROM ubuntu:20.04 as rosetta-builder
 
 MAINTAINER cronic@horizen.io
 
@@ -87,7 +87,7 @@ RUN set -euxo pipefail \
 
 
 ## Build Final Image
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 MAINTAINER cronic@horizen.io
 

diff --git a/Makefile b/Makefile
@@ -22,7 +22,7 @@ NOFILE=100000
 # Daniele Rogora <danielerogora@horizenlabs.io> https://keys.openpgp.org/vks/v1/by-fingerprint/661F6FC64773A0F47936625FD3A22623FF9B9F11
 # Alessandro Petrini <apetrini@horizenlabs.io> https://keys.openpgp.org/vks/v1/by-fingerprint/BF1FCDC8AEE7AE53013FF0941FCA7260796CB902
 ZEND_MAINTAINER_KEYS?=219f55740bbf7a1ce368ba45fb7053ce4991b669 FC3388A460ACFAB04E8328C07BB2A1D2CFDFCD2C D0459BD6AAD14E8D9C83FF1E8EDE560493C65AC1 661F6FC64773A0F47936625FD3A22623FF9B9F11 BF1FCDC8AEE7AE53013FF0941FCA7260796CB902
-ZEN_COMMITTISH?=v4.0.0-rc3
+ZEN_COMMITTISH?=v4.1.0-rc1
 
 deps:
 	go get ./...

diff --git a/ci/devtools/bump_version.sh b/ci/devtools/bump_version.sh
@@ -2,8 +2,8 @@
 
 set -eEuox pipefail
 
-ZEND_VERISON_OLD="${ZEND_VERISON_OLD:-4.0.0-rc3}"
-ZEND_VERSION_NEW="${ZEND_VERSION_NEW:-4.0.0}"
+ZEND_VERISON_OLD="${ZEND_VERISON_OLD:-4.0.0}"
+ZEND_VERSION_NEW="${ZEND_VERSION_NEW:-4.1.0-rc1}"
 
 bsd_sed=""
 [ "$(uname -s)" = "Darwin" ] && bsd_sed=" ''"

diff --git a/services/network_service_test.go b/services/network_service_test.go
@@ -30,7 +30,7 @@ var (
 	defaultNetworkOptions = &types.NetworkOptionsResponse{
 		Version: &types.Version{
 			RosettaVersion:    types.RosettaAPIVersion,
-			NodeVersion:       "4.0.0",
+			NodeVersion:       "4.1.0-rc1",
 			MiddlewareVersion: &middlewareVersion,
 		},
 		Allow: &types.Allow{

diff --git a/services/types.go b/services/types.go
@@ -24,7 +24,7 @@ import (
 const (
 	// NodeVersion is the version of
 	// zend core we are using.
-	NodeVersion = "4.0.0"
+	NodeVersion = "4.1.0-rc1"
 
 	// HistoricalBalanceLookup indicates
 	// that historical balance lookup is supported.