builder/multiarch

.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:
@@ -268,7 +267,11 @@ commands:
                 --set consensusnode.persistence.enabled=true \
                 --set node.serviceMonitor.enabled=true \
                 --set bootnode.serviceMonitor.enabled=false \
-                --set consensusnode.serviceMonitor.enabled=true
+                --set consensusnode.serviceMonitor.enabled=true \
+                --set node.nodeSelector."cloud\\.google\\.com/gke-nodepool"=blockchain-prnet \
+                --set bootnode.nodeSelector."cloud\\.google\\.com/gke-nodepool"=blockchain-prnet \
+                --set consensusnode.nodeSelector."cloud\\.google\\.com/gke-nodepool"=blockchain-prnet \
+                --set node.indexer.enabled=true
             fi
 
   cleanup_prnet_chart:
@@ -324,39 +327,57 @@ commands:
             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 (${IMAGE})
           command: |
             docker build -t ${IMAGE}:${VERSION} .
 
+  build_builder:
+    description: Builds docker image
+    steps:
+      - run:
+          name: Create builder
+          command: |
+            docker buildx create --name taraxa-builder --use --bootstrap
+
+      - run:
+         name: Build builder image (multiarch)
+         command: |
+           # docker build -t ${IMAGE}:${VERSION} -f builder.Dockerfile .
+           docker buildx build \
+             --output=type=local,dest=/tmp \
+             --platform linux/arm64,linux/amd64 \
+             --tag taraxa/${IMAGE}:123 \
+             -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:
@@ -458,8 +479,16 @@ commands:
       - run:
           name: Push Images
           command: |
-            docker push taraxa/${IMAGE}:${CIRCLE_TAG}
-            docker push taraxa/${IMAGE}:latest
+
+            if [[ ${CIRCLE_TAG} != "" ]];then
+              TAG=$(echo ${CIRCLE_TAG} | sed 's/^builder-//g')
+              docker push taraxa/${IMAGE}:${TAG}
+              docker push taraxa/${IMAGE}:latest
+            else
+              docker push taraxa/${IMAGE}:${VERSION}
+            fi
+
+
 
   test:
     description: Run tests
@@ -568,6 +597,8 @@ jobs:
             https://explorer-pr-<<pipeline.parameters.pr_number>>.prnet.taraxa.io </a></td></tr> \
             <tr><td>RPC</td><td><a href=https://rpc-pr-<<pipeline.parameters.pr_number>>.prnet.taraxa.io >\
             https://rpc-pr-<<pipeline.parameters.pr_number>>.prnet.taraxa.io </a></td></tr>\
+            <tr><td>Indexer</td><td><a href=https://indexer-pr-<<pipeline.parameters.pr_number>>.prnet.taraxa.io >\
+            https://indexer-pr-<<pipeline.parameters.pr_number>>.prnet.taraxa.io </a></td></tr>\
             </table>\
             <h4><p>Boot Nodes</p></h4>\
             <table>\
@@ -685,6 +716,34 @@ jobs:
       - store_artifacts:
           path: tmp_docker
 
+  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
+
+
   release-docker-image:
       environment:
         - IMAGE: taraxa-node
@@ -989,6 +1048,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:
@@ -1005,6 +1105,10 @@ workflows:
                 - /^chore\/chart-.*/
                 - /^fix\/chart-.*/
                 - /^feature\/chart-.*/
+                - /^builder\/.*/
+                - /^chore\/builder-.*/
+                - /^fix\/builder-.*/
+                - /^feature\/builder-.*/
           context:
             - TARAXA
             - GCP
@@ -1029,7 +1133,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:
@@ -1055,7 +1161,6 @@ workflows:
               - /^fix\/chart-.*/
               - /^feature\/chart-.*/
 
-
   # run this workflow for tags, like chart-vX.Y.Z
   release-helm-chart:
     jobs:
@@ -1071,4 +1176,5 @@ workflows:
             branches:
               ignore: /.*/
             tags:
-              only: /^chart-v\d+.\d+.\d+/
+              only: /^chart-v\d+.\d+.\d+/
+  # ### workflows for taraxa-node helm chart ### #

CMakeLists.txt

@@ -13,7 +13,7 @@ set(TARAXA_NET_VERSION 1)
 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 0)
+set(TARAXA_DB_MINOR_VERSION 1)
 
 # Defines Taraxa library target.
 project(taraxa-node VERSION ${TARAXA_VERSION})
@@ -48,6 +48,7 @@ endif()
 set(CMAKE_CXX_FLAGS_RELEASE "-O3")
 set(CMAKE_CXX_FLAGS_DEBUG "-g")
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g -O2")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
 
 # Enable LTO
 option(TARAXA_ENABLE_LTO "Build taraxad with LTO (ON or OFF)" OFF)
@@ -161,8 +162,15 @@ else()
 
     include(${CMAKE_BINARY_DIR}/conan.cmake)
 
-    conan_cmake_run(CONANFILE conanfile.py BUILD_TYPE ${CMAKE_BUILD_TYPE} BUILD missing
-                    BASIC_SETUP CMAKE_TARGETS KEEP_RPATHS PROFILE ${CONAN_PROFILE})
+    conan_cmake_run(CONANFILE conanfile.py 
+                    BUILD_TYPE ${CMAKE_BUILD_TYPE} 
+                    CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE}
+                    BASIC_SETUP 
+                    CMAKE_TARGETS 
+                    KEEP_RPATHS 
+                    PROFILE ${CONAN_PROFILE}
+                    BUILD missing
+                    )
     set(CONAN_EXPORTED true CACHE BOOL "Is conan already run on the project")
 endif()
 
@@ -203,6 +211,11 @@ include(CMakeModules/git_info.cmake)
 find_package(GMP)
 find_package(MPFR)
 
+include(ExternalProject)
+# use JSONCPP library from conan for JSONRPCCPP build 
+set(JSONCPP_INCLUDE_DIR ${CONAN_INCLUDE_DIRS_JSONCPP})
+include(ProjectJSONRPCCPP)
+
 # Add sub-directories cmakes
 add_subdirectory(submodules)
 add_subdirectory(libraries)