From de9f98d89d6f9276e2027fcd739e99ee21f5c7cd Mon Sep 17 00:00:00 2001 From: voyenavion Date: Fri, 4 Aug 2023 16:54:02 -0400 Subject: [PATCH 1/4] feat: zen 4.1.0-rc0 (deprecates shielded txs) --- Dockerfile | 4 ++-- services/network_service_test.go | 2 +- services/types.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index f9a6e442..ad29548c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,8 +20,8 @@ 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-rc0 +ARG ZEN_COMMITTISH=v4.1.0-rc0 ARG IS_RELEASE=false # cronic https://keys.openpgp.org/vks/v1/by-fingerprint/219F55740BBF7A1CE368BA45FB7053CE4991B669 # Luigi Varriale https://keys.openpgp.org/vks/v1/by-fingerprint/FC3388A460ACFAB04E8328C07BB2A1D2CFDFCD2C diff --git a/services/network_service_test.go b/services/network_service_test.go index 8fd538c6..0ced96d5 100644 --- 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-rc0", MiddlewareVersion: &middlewareVersion, }, Allow: &types.Allow{ diff --git a/services/types.go b/services/types.go index d75e8f92..8d04a27b 100644 --- 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-rc0" // HistoricalBalanceLookup indicates // that historical balance lookup is supported. From 083d605c539fa188af09a79a4de732da20a3d142 Mon Sep 17 00:00:00 2001 From: cronicc Date: Mon, 7 Aug 2023 19:01:53 +0200 Subject: [PATCH 2/4] Apply suggestions from code review --- Dockerfile | 4 ++-- services/network_service_test.go | 2 +- services/types.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index ad29548c..6bcf238f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,8 +20,8 @@ MAINTAINER cronic@horizen.io SHELL ["/bin/bash", "-c"] -# Latest release zen 4.1.0-rc0 -ARG ZEN_COMMITTISH=v4.1.0-rc0 +# Latest release zen 4.1.0-rc1 +ARG ZEN_COMMITTISH=v4.1.0-rc1 ARG IS_RELEASE=false # cronic https://keys.openpgp.org/vks/v1/by-fingerprint/219F55740BBF7A1CE368BA45FB7053CE4991B669 # Luigi Varriale https://keys.openpgp.org/vks/v1/by-fingerprint/FC3388A460ACFAB04E8328C07BB2A1D2CFDFCD2C diff --git a/services/network_service_test.go b/services/network_service_test.go index 0ced96d5..d0d040b7 100644 --- 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.1.0-rc0", + NodeVersion: "4.1.0-rc1", MiddlewareVersion: &middlewareVersion, }, Allow: &types.Allow{ diff --git a/services/types.go b/services/types.go index 8d04a27b..dd994a5e 100644 --- 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.1.0-rc0" + NodeVersion = "4.1.0-rc1" // HistoricalBalanceLookup indicates // that historical balance lookup is supported. From 85df503fecaf39dbc4fd52eb33f9326c076c6af3 Mon Sep 17 00:00:00 2001 From: cronicc Date: Mon, 7 Aug 2023 17:11:53 +0000 Subject: [PATCH 3/4] Bump zend version to v4.1.0-rc1 --- .travis.yml | 2 +- Makefile | 2 +- ci/devtools/bump_version.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index d805aca4..e3194471 100644 --- 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/Makefile b/Makefile index 6219cf20..febf2da3 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ NOFILE=100000 # Daniele Rogora https://keys.openpgp.org/vks/v1/by-fingerprint/661F6FC64773A0F47936625FD3A22623FF9B9F11 # Alessandro Petrini 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 index f18e2a68..117229f9 100755 --- 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=" ''" From b6e6036567f7a1cb7db5f23f5c0bd50f74fddc11 Mon Sep 17 00:00:00 2001 From: cronicc Date: Mon, 7 Aug 2023 17:20:33 +0000 Subject: [PATCH 4/4] Switch to Ubuntu Focal (Bionic is EOL) --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6bcf238f..01af97e9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ # limitations under the License. ## Build zend -FROM ubuntu:18.04 as zend-builder +FROM ubuntu:20.04 as zend-builder MAINTAINER cronic@horizen.io @@ -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