Partial ZSA Support: Transaction V6, NU7, generics for backward compatibility, pre-state consensus

.cargo/config.toml

@@ -3,6 +3,12 @@
 # Flags that apply to all Zebra crates and configurations
 [target.'cfg(all())']
 rustflags = [
+    # Enable tx-v6 everywhere by default
+    "--cfg", 'feature="tx-v6"',
+
+    # TODO: Consider removing this line later (it's needed for the ZSA version of librustzcash crates)
+    "--cfg", "zcash_unstable=\"nu6\"",
+
     # Zebra standard lints for Rust 1.65+
 
     # High-risk code
@@ -82,6 +88,12 @@ rustflags = [
 
 [build]
 rustdocflags = [
+    # Enable tx-v6 everywhere by default
+    "--cfg", 'feature="tx-v6"',
+
+    # TODO: Consider removing this line later (it's needed for the ZSA version of librustzcash crates)
+    "--cfg", "zcash_unstable=\"nu6\"",
+
     # The -A and -W settings must be the same as the `RUSTDOCFLAGS` in:
     # https://github.com/ZcashFoundation/zebra/blob/main/.github/workflows/docs-deploy-firebase.yml#L68
 

.github/workflows/ci-basic.yml

@@ -0,0 +1,34 @@
+name: Basic checks
+
+#on: [push, pull_request]
+on: [push]
+
+jobs:
+  test:
+    name: Test on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-24.04]
+
+    env:
+      # Use system-installed RocksDB library instead of building from scratch
+      ROCKSDB_LIB_DIR: /usr/lib
+      # Use system-installed Snappy library for compression in RocksDB
+      SNAPPY_LIB_DIR: /usr/lib/x86_64-linux-gnu
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install dependencies on Ubuntu
+        #run: sudo apt-get update && sudo apt-get install -y protobuf-compiler build-essential librocksdb-dev
+        run: sudo apt-get update && sudo apt-get install -y protobuf-compiler librocksdb-dev
+      - name: Run tests
+        run: cargo test --verbose
+      - name: Verify working directory is clean
+        run: git diff --exit-code
+      - name: Run doc check
+        run: cargo doc --all-features --document-private-items
+      - name: Run format check
+        run: cargo fmt -- --check
+      - name: Run clippy
+        run: cargo clippy --workspace --all-features --all-targets -- -D warnings

.github/workflows/deploy-ecs.yaml

@@ -0,0 +1,126 @@
+# This GitHub Actions workflow automates deploying the Zebra Server to Amazon ECS.
+# It allows manual triggering with the ability to choose which image tag to deploy.
+# Because of the "force-new-deployment" flag, the ECS service will update to a new 'latest' image, if one was pushed.
+name: Deploy to Amazon ECS
+on:
+  workflow_dispatch:
+    inputs:
+      image_tag:
+        description: 'Docker image tag to deploy (e.g., latest, v1.0.0, commit-hash)'
+        required: true
+        type: string
+        default: 'latest'
+env:
+  AWS_REGION: ${{ vars.AWS_REGION || 'eu-central-1' }}
+  ECR_REPOSITORY: ${{ vars.ECR_REPOSITORY || 'dev-zebra-server' }}
+  ECS_SERVICE: ${{ vars.ECS_SERVICE || 'dev-zebra' }}
+  ECS_CLUSTER: ${{ vars.ECS_CLUSTER || 'dev-zebra-cluster' }}
+  TASK_DEFINITION: ${{ vars.TASK_DEFINITION || 'dev-zebra-task' }}
+  CONTAINER_NAME: ${{ vars.CONTAINER_NAME || 'zebra-container' }}
+jobs:
+  deploy-to-ecs:
+    name: Deploy to ECS
+    runs-on: ubuntu-latest
+    environment: production
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ env.AWS_REGION }}
+      - name: Login to Amazon ECR
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v2
+      - name: Deploy to Amazon ECS
+        id: deploy-ecs
+        env:
+          ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+          IMAGE_TAG: ${{ github.event.inputs.image_tag }}
+        run: |
+          # Construct the full image URI
+          IMAGE_URI="$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
+
+          echo "Deploying image: $IMAGE_URI"
+          echo "ECS Service: $ECS_SERVICE"
+          echo "ECS Cluster: $ECS_CLUSTER"
+          echo "Task Definition: $TASK_DEFINITION"
+          echo "Container Name: $CONTAINER_NAME"
+
+          # Download the current task definition
+          aws ecs describe-task-definition \
+            --task-definition $TASK_DEFINITION \
+            --query 'taskDefinition' > task-definition.json
+
+          # Get the current task definition ARN from the downloaded file
+          TASK_DEFINITION_ARN=$(jq -r '.taskDefinitionArn' task-definition.json)
+
+          echo "Current task definition ARN: $TASK_DEFINITION_ARN"
+
+          # Update the image in the task definition
+          jq --arg IMAGE_URI "$IMAGE_URI" --arg CONTAINER_NAME "$CONTAINER_NAME" \
+            '.containerDefinitions |= map(if .name == $CONTAINER_NAME then .image = $IMAGE_URI else . end) | del(.taskDefinitionArn, .revision, .status, .requiresAttributes, .placementConstraints, .compatibilities, .registeredAt, .registeredBy)' \
+            task-definition.json > updated-task-definition.json
+
+          # Register the new task definition
+          NEW_TASK_DEFINITION_ARN=$(aws ecs register-task-definition \
+            --cli-input-json file://updated-task-definition.json \
+            --query 'taskDefinition.taskDefinitionArn' \
+            --output text)
+
+          echo "New task definition ARN: $NEW_TASK_DEFINITION_ARN"
+
+          # Update the ECS service with the new task definition
+          aws ecs update-service \
+            --cluster $ECS_CLUSTER \
+            --service $ECS_SERVICE \
+            --task-definition $NEW_TASK_DEFINITION_ARN \
+            --force-new-deployment
+
+          # Wait for the service to be stable
+          echo "Waiting for ECS service to be stable..."
+          aws ecs wait services-stable \
+            --cluster $ECS_CLUSTER \
+            --services $ECS_SERVICE
+
+          # Check the actual service status after waiting
+          echo "Checking service status..."
+          SERVICE_STATUS=$(aws ecs describe-services \
+            --cluster $ECS_CLUSTER \
+            --services $ECS_SERVICE \
+            --query 'services[0].status' \
+            --output text)
+
+          echo "Service Status: $SERVICE_STATUS"
+
+          # Check if deployment was successful
+          if [ "$SERVICE_STATUS" = "ACTIVE" ]; then
+            echo "Deployment completed successfully!"
+          else
+            echo "Deployment may have issues. Service status: $SERVICE_STATUS"
+            exit 1
+          fi
+
+          # Output the deployment information
+          echo "deployed_image=$IMAGE_URI" >> $GITHUB_OUTPUT
+          echo "ecs_service=$ECS_SERVICE" >> $GITHUB_OUTPUT
+          echo "ecs_cluster=$ECS_CLUSTER" >> $GITHUB_OUTPUT
+          echo "task_definition_arn=$NEW_TASK_DEFINITION_ARN" >> $GITHUB_OUTPUT
+      - name: Get deployment status
+        run: |
+          echo "Deployment Status:"
+          aws ecs describe-services \
+            --cluster $ECS_CLUSTER \
+            --services $ECS_SERVICE \
+            --query 'services[0].{ServiceName:serviceName,Status:status,DesiredCount:desiredCount,RunningCount:runningCount,PendingCount:pendingCount,TaskDefinition:taskDefinition}' \
+            --output table
+
+          echo ""
+          echo "Current running tasks:"
+          aws ecs list-tasks \
+            --cluster $ECS_CLUSTER \
+            --service-name $ECS_SERVICE \
+            --query 'taskArns' \
+            --output table

.github/workflows/push-ecr.yaml

@@ -0,0 +1,119 @@
+# This GitHub Actions workflow automates pushing the Zebra Server Docker image to Amazon ECR.
+# It triggers on any new tag or manual dispatch, builds a Docker image, and pushes it to Amazon Elastic Container Registry (ECR).
+name: Push to Amazon ECR
+
+on:
+  push:
+    tags:
+      - '*' # Triggers the workflow on any new tag
+  workflow_dispatch:
+    inputs:
+      image_tag_version:
+        description: 'Version to tag the Docker image'
+        required: false
+        type: string
+
+env:
+  AWS_REGION: ${{ vars.AWS_REGION || 'eu-central-1' }}
+  ECR_REPOSITORY: ${{ vars.ECR_REPOSITORY || 'dev-zebra-server' }}
+  DOCKERFILE_PATH: ${{ vars.DOCKERFILE_PATH }}
+
+jobs:
+  push-to-ecr:
+    name: Push to ECR
+    runs-on: ubuntu-latest
+    environment: production
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ env.AWS_REGION }}
+
+      - name: Login to Amazon ECR
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v2
+
+      - name: Get Git tags and set image tags
+        id: vars
+        run: |
+          git fetch --tags
+
+          # Get exact match tag if it exists (will be empty if the current commit doesn't have a tag)
+          GIT_TAG=$(git describe --exact-match --tags 2>/dev/null || echo "")
+
+          # Set environment variables and echo results
+          if [ -n "$GIT_TAG" ]; then
+            echo "GIT_TAG=$GIT_TAG" >> $GITHUB_ENV
+            echo "Git Tag Discovery:"
+            echo "  Found exact match Git tag: $GIT_TAG"
+          else
+            echo "Git Tag Discovery:"
+            echo "  No exact match Git tag found for current commit"
+          fi
+
+          # Set the input IMAGE_TAG_VERSION
+          echo "IMAGE_TAG_VERSION=${{ github.event.inputs.image_tag_version }}" >> $GITHUB_ENV
+          echo "  User-provided IMAGE_TAG_VERSION: ${{ github.event.inputs.image_tag_version }}"
+
+      - name: Build, tag, and push image to Amazon ECR
+        id: build-image
+        env:
+          ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+          IMAGE_TAG_LATEST: latest
+        run: |
+          # Build docker container with multiple tags
+          DOCKER_BUILD_ARGS=()
+          DOCKER_BUILD_ARGS+=("-t" "$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG_LATEST")
+          DOCKER_BUILD_ARGS+=("-t" "$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG_VERSION")
+
+          # Add exact tag if it exists
+          if [ -n "$GIT_TAG" ]; then
+            DOCKER_BUILD_ARGS+=("-t" "$ECR_REGISTRY/$ECR_REPOSITORY:$GIT_TAG")
+          fi
+
+          # Echo final tags that will be pushed
+          echo "Docker Image Tags to be pushed:"
+          for arg in "${DOCKER_BUILD_ARGS[@]}"; do
+            if [[ "$arg" != "-t" ]]; then
+              echo "  $arg"
+            fi
+          done
+          echo ""
+
+          # Build with all tags
+          echo "Building Docker image..."
+          docker build "${DOCKER_BUILD_ARGS[@]}" -f $DOCKERFILE_PATH .
+
+          # Push all tags with error handling
+          for tag in "$IMAGE_TAG_LATEST" "$IMAGE_TAG_VERSION" "$GIT_TAG"; do
+                # Skip empty tags (e.g., if GIT_TAG is unset)
+                [ -z "$tag" ] && continue
+
+                image="$ECR_REGISTRY/$ECR_REPOSITORY:$tag"
+                echo "Pushing $image…"
+                if ! docker push "$image"; then
+                  echo "Failed to push $image"
+                  exit 1
+                fi
+              done
+
+          # Output the image URIs
+          echo "image_latest=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG_LATEST" >> $GITHUB_OUTPUT
+          echo "image_version=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG_VERSION" >> $GITHUB_OUTPUT
+
+          if [ -n "$GIT_TAG" ]; then
+            echo "image_exact_tag=$ECR_REGISTRY/$ECR_REPOSITORY:$GIT_TAG" >> $GITHUB_OUTPUT
+          fi
+
+          # Print the public repository URL
+          echo ""
+          echo "====================================="
+          echo "Public ECR Repository URL:"
+          echo "https://gallery.ecr.aws/$ECR_REPOSITORY"
+          echo "====================================="