Release 1.5.0rc

.circleci/config.yml

@@ -26,7 +26,6 @@ orbs:
   github-release: izumin5210/[email protected]
   gcp-gcr: circleci/[email protected]
   gcp-cli: circleci/[email protected]
-  docker-cache: cci-x/[email protected]
   helm-release: taraxa/[email protected]
 
 commands:
@@ -184,10 +183,10 @@ commands:
       - run:
           name: Cleanup PRNet IPs
           command: |
-            if [[ $(gcloud compute addresses list --format json  --project << parameters.project >> --filter="name~'prnet-boot-<< parameters.pr-name >>.*'" ) != "[]" ]];then 
+            if [[ $(gcloud compute addresses list --format json  --project << parameters.project >> --filter="name~'prnet-boot-<< parameters.pr-name >>.*'" ) != "[]" ]];then
              gcloud compute addresses delete prnet-boot-<< parameters.pr-name >>-{1..3} --region << parameters.region >>  --project << parameters.project >> --quiet
             fi
-            if [[ $(gcloud compute addresses list --format json  --project << parameters.project >> --filter="name~'prnet-rpc-<< parameters.pr-name >>.*'" ) != "[]" ]];then 
+            if [[ $(gcloud compute addresses list --format json  --project << parameters.project >> --filter="name~'prnet-rpc-<< parameters.pr-name >>.*'" ) != "[]" ]];then
              gcloud compute addresses delete prnet-rpc-<< parameters.pr-name >>-{1..3} --region << parameters.region >>  --project << parameters.project >> --quiet
             fi
           when: << parameters.when >>
@@ -216,7 +215,7 @@ commands:
             echo -n "<< parameters.kubeconfig >>" | base64 --decode > $HOME/.kube/config
             curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash
             curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
-            sudo cp kubectl /usr/local/bin 
+            sudo cp kubectl /usr/local/bin
             sudo chmod +x /usr/local/bin/kubectl
           when: << parameters.when >>
 
@@ -306,7 +305,7 @@ commands:
                   echo "waiting.. for all resources to be deleted"
                   echo ${GETALL}
                   sleep 10
-                fi             
+                fi
               done
               if [ $i -eq 50 ];then
                 echo "Exiting after 500 seconds not all resources may have cleaned up"
@@ -320,47 +319,55 @@ commands:
     steps:
       - run:
           name: Prepare env variables
-          command: | 
+          command: |
             echo "export PR=$( [[ -z ${CIRCLE_PULL_REQUEST+x} ]] && echo false || echo $(basename ${CIRCLE_PULL_REQUEST}) )" >> $BASH_ENV
             export PR=$( [[ -z ${CIRCLE_PULL_REQUEST+x} ]] && echo false || echo $(basename ${CIRCLE_PULL_REQUEST}) )
             echo "export SHORT_GIT_HASH=$(echo $CIRCLE_SHA1 | cut -c -7)" >> $BASH_ENV
             echo "export VERSION=$(git rev-parse --short HEAD)" >> $BASH_ENV
             echo "export HELM_TEST_NAME=pr-${PR}" >> $BASH_ENV
             echo "export DOCKER_BRANCH_TAG=$(./scripts/docker_tag_from_branch.sh $CIRCLE_BRANCH)" >> $BASH_ENV
             echo "export GCP_IMAGE=gcr.io/${GOOGLE_PROJECT_ID}/${IMAGE}" >> $BASH_ENV
-      - run:
-          name: Clean old Images if disk available is lower than 15G
-          command: |
-            for time in 120 96 72 48 24 12 6 3 1 0
-            do
-              if [ $(df  /var/lib/docker --block-size=1073741824 --output=avail|grep -v Avail) -lt 15 ]; then 
-                 df  /var/lib/docker --block-size=1073741824 --output=avail
-                 echo "Pruning images older than ${time}h"
-                 docker image prune -a --force --filter "until=${time}h"
-               fi
-            done
 
   build:
-    description: Builds docker images
+    description: Builds docker image (${IMAGE})
     steps:
-      - run:
-          name: Build builder image
-          command: |
-            docker build -t ${IMAGE}:${VERSION} --target builder .
       - run:
           name: Checkout Submodules
           command: |
             git submodule sync
             git submodule update --init --recursive --jobs 8
       - run:
-          name: Build ctest image
+          name: Compile and build binaries
           command: |
             docker build -t ${IMAGE}-ctest:${VERSION} --target build .
       - run:
-          name: Build taraxad image
+          name: Build final Docker image
           command: |
             docker build -t ${IMAGE}:${VERSION} .
 
+  build_builder:
+    description: Builds docker image (${IMAGE})
+    steps:
+      - run:
+          name: Build builder image
+          command: |
+            docker build -t ${IMAGE}:${VERSION} -f builder.Dockerfile .
+
+  tag_builder:
+    description: Tags docker images (builder)
+    steps:
+      - run:
+          name: Tag images
+          command: |
+
+            if [[ ${CIRCLE_TAG} != "" ]];then
+              TAG=$(echo ${CIRCLE_TAG} | sed 's/^builder-//g')
+              docker tag ${IMAGE}:${VERSION} taraxa/${IMAGE}:${TAG}
+              docker tag ${IMAGE}:${VERSION} taraxa/${IMAGE}:latest
+            else
+              docker tag ${IMAGE}:${VERSION} taraxa/${IMAGE}:${VERSION}
+            fi
+
   tag:
     description: Tags docker images
     steps:
@@ -504,24 +511,24 @@ commands:
             if [ ! -z "$(docker network list --format '{{.Name}}' | grep -o smoketest-${VERSION})" ]; then
               docker network rm smoketest-${VERSION} >/dev/null;
             fi
-            
+
             docker network create --driver=bridge \
               smoketest-${VERSION}
-            
+
             docker run -d\
               --name smoketest-${VERSION} \
               --net smoketest-${VERSION} \
               ${IMAGE}:${VERSION} \
               single
-            
+
             mkdir -p  $PWD/test_build-d/
-            
+
             sleep 30
 
             echo "--- Logs from container ---"
             docker logs smoketest-${VERSION}
             echo "--- Logs from container ---"
-            
+
             http_code=$(docker run --rm  -v $PWD/test_build-d:/data \
               --net smoketest-${VERSION} \
               byrnedo/alpine-curl \
@@ -540,7 +547,7 @@ commands:
                           "secret": "3800b2875669d9b2053c1aff9224ecfdc411423aac5b5a73d7a45ced1c3b9dcd"
                       }]
                   }')
-              
+
             cat $PWD/test_build-d/http.out || true
             if [[ $http_code -eq 200 ]] ; then
                 exit 0
@@ -701,9 +708,34 @@ jobs:
       - test
       - tag
       - push_gcr
+
+  build-builder-docker-image:
+    environment:
+      - IMAGE: taraxa-builder
+      - CONAN_REVISIONS_ENABLED: 1
+    machine:
+      image: ubuntu-2204:2022.04.2
+      docker_layer_caching: true
+    resource_class: large
+    steps:
+      - checkout
+      - prepare
+      - run:
+          name: List images restored from DLC
+          command: |
+            docker images
+      - build_builder
+      - run:
+          name: List images to be saved in DLC
+          command: |
+            docker images
+      - run:
+          name: Show layers of taraxa-builder image
+          command: |
+            docker history taraxa-builder:${VERSION}
+      - tag_builder
       - push_dockerhub
-      - store_artifacts:
-          path: tmp_docker
+
 
   release-docker-image:
       environment:
@@ -720,8 +752,6 @@ jobs:
         - test
         - tag
         - push_dockerhub
-        - store_artifacts:
-            path: tmp_docker
 
   create-and-push-builder:
     docker:
@@ -1009,6 +1039,47 @@ workflows:
             - build-linux
             - build-mac
 
+
+  # ### workflows for builder image ### #
+  # run this workflow for specific branches 'builder/*'
+  build-builder-docker-image:
+    when:
+      and:
+        - not: << pipeline.parameters.deploy_prnet >>
+        - not: << pipeline.parameters.redeploy_prnet >>
+        - not: << pipeline.parameters.cleanup_prnet >>
+    jobs:
+      - build-builder-docker-image:
+          filters:
+            branches:
+              only:
+                - /^builder\/.*/
+                - /^chore\/builder-.*/
+                - /^fix\/builder-.*/
+                - /^feature\/builder-.*/
+          context:
+            - DOCKERHUB
+
+  # run this workflow for specific tags 'builder/*'
+  release-builder-docker-image:
+    when:
+      and:
+        - not: << pipeline.parameters.deploy_prnet >>
+        - not: << pipeline.parameters.redeploy_prnet >>
+        - not: << pipeline.parameters.cleanup_prnet >>
+    jobs:
+      - build-builder-docker-image:
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^builder-v\d+.\d+.\d+/
+          context:
+            - DOCKERHUB
+  # ### workflows for builder image ### #
+
+
+  # ### workflows for taraxa-node image ### #
   # run this workflow for all branches apart those reserved for chart
   build-docker-image:
     when:
@@ -1026,6 +1097,10 @@ workflows:
                 - /^chore\/chart-.*/
                 - /^fix\/chart-.*/
                 - /^feature\/chart-.*/
+                - /^builder\/.*/
+                - /^chore\/builder-.*/
+                - /^fix\/builder-.*/
+                - /^feature\/builder-.*/
           context:
             - TARAXA
             - GCP
@@ -1060,7 +1135,7 @@ workflows:
       - release-docker-image:
           filters:
             tags:
-              only: 
+              only:
               - /^v?\d+\.\d+\.\d+$/
               - /^v?\d+\.\d+\.\d+-beta$/
             branches:
@@ -1071,7 +1146,9 @@ workflows:
             - K8S
             - GCR
             - DOCKERHUB
+  # ### workflows for taraxa-node image ### #
 
+  # ### workflows for taraxa-node helm chart ### #
   # run this workflow for branches specified below
   build-helm-chart:
     when:
@@ -1091,13 +1168,12 @@ workflows:
             - CHARTSREPO
           filters:
             branches:
-              only: 
+              only:
               - /^chart\/.*/
               - /^chore\/chart-.*/
               - /^fix\/chart-.*/
               - /^feature\/chart-.*/
 
-
   # run this workflow for tags, like chart-vX.Y.Z
   release-helm-chart:
     jobs:
@@ -1114,3 +1190,4 @@ workflows:
               ignore: /.*/
             tags:
               only: /^chart-v\d+.\d+.\d+/
+  # ### workflows for taraxa-node helm chart ### #

CMakeLists.txt

@@ -2,18 +2,18 @@ cmake_minimum_required(VERSION 3.20)
 
 # Set current version of the project
 set(TARAXA_MAJOR_VERSION 1)
-set(TARAXA_MINOR_VERSION 4)
-set(TARAXA_PATCH_VERSION 9)
+set(TARAXA_MINOR_VERSION 5)
+set(TARAXA_PATCH_VERSION 0)
 set(TARAXA_VERSION ${TARAXA_MAJOR_VERSION}.${TARAXA_MINOR_VERSION}.${TARAXA_PATCH_VERSION})
 
 # Any time a change in the network protocol is introduced this version should be increased
-set(TARAXA_NET_VERSION 1)
+set(TARAXA_NET_VERSION 2)
 # Major version is modified when DAG blocks, pbft blocks and any basic building blocks of our blockchain is modified
 # in the db
 set(TARAXA_DB_MAJOR_VERSION 1)
 # Minor version should be modified when changes to the database are made in the tables that can be rebuilt from the
 # basic tables
-set(TARAXA_DB_MINOR_VERSION 1)
+set(TARAXA_DB_MINOR_VERSION 2)
 
 # Defines Taraxa library target.
 project(taraxa-node VERSION ${TARAXA_VERSION})

CMakeModules/cppcheck.cmake

@@ -11,6 +11,7 @@ else ()
             --error-exitcode=1
             --enable=all
             --suppress=missingInclude
+            --suppress=missingIncludeSystem
             # find_if - useless here
             --suppress=useStlAlgorithm:${PROJECT_SOURCE_DIR}/*/pbft_sync_packet_handler.cpp
             --suppress=noExplicitConstructor
@@ -36,8 +37,10 @@ else ()
             --suppress=unmatchedSuppression:${PROJECT_SOURCE_DIR}/*/Common.h
             --suppress=cstyleCast:${PROJECT_SOURCE_DIR}/*/vector_ref.h
             --suppress=cstyleCast:${PROJECT_SOURCE_DIR}/*/Common.h
-            #not an issue here 
+            # not an issue here
             --suppress=virtualCallInConstructor:${PROJECT_SOURCE_DIR}/*/final_chain.cpp
+            # just a warning
+            --suppress=duplInheritedMember:${PROJECT_SOURCE_DIR}/*/FixedHash.h
             # Only show found errors
             "--quiet"