devshard v2 (v0.2.13-devshard-v2)

.github/workflows/docker-build.yml

@@ -0,0 +1,143 @@
+# Build and push Docker images for decentralized-api and inference-chain.
+# Mirrors the pattern from dev/hacked/.github/workflows/docker-build.yml (subset of targets).
+name: Build Docker (decentralized-api & inference-chain)
+
+on:
+  workflow_dispatch:
+    inputs:
+      build_target:
+        description: 'What to build'
+        required: true
+        type: choice
+        options:
+          - decentralized-api
+          - inference-chain
+          - both
+      version_tag:
+        description: 'Version tag (leave empty for latest)'
+        required: false
+        type: string
+        default: 'latest'
+      push_to_registry:
+        description: 'Push to registry'
+        required: true
+        type: boolean
+        default: true
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_PREFIX: ${{ github.repository_owner }}
+
+jobs:
+  build-decentralized-api:
+    if: ${{ github.event.inputs.build_target == 'decentralized-api' || github.event.inputs.build_target == 'both' }}
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to Container Registry
+        if: ${{ github.event.inputs.push_to_registry == 'true' }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_PREFIX }}/decentralized-api
+          tags: |
+            type=raw,value=${{ github.event.inputs.version_tag || 'latest' }}
+            type=sha,prefix=
+            type=ref,event=branch
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./decentralized-api/Dockerfile
+          push: ${{ github.event.inputs.push_to_registry == 'true' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          build-args: |
+            GOOS=linux
+            GOARCH=amd64
+
+  build-inference-chain:
+    if: ${{ github.event.inputs.build_target == 'inference-chain' || github.event.inputs.build_target == 'both' }}
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to Container Registry
+        if: ${{ github.event.inputs.push_to_registry == 'true' }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_PREFIX }}/gonka-node-test
+          tags: |
+            type=raw,value=${{ github.event.inputs.version_tag || 'latest' }}
+            type=sha,prefix=
+            type=ref,event=branch
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./inference-chain/Dockerfile
+          push: ${{ github.event.inputs.push_to_registry == 'true' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          build-args: |
+            GOOS=linux
+            GOARCH=amd64
+
+  summary:
+    needs: [build-decentralized-api, build-inference-chain]
+    if: always()
+    runs-on: ubuntu-latest
+    steps:
+      - name: Build Summary
+        run: |
+          echo "## Docker Build Summary" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "**Build Target:** ${{ github.event.inputs.build_target }}" >> $GITHUB_STEP_SUMMARY
+          echo "**Version Tag:** ${{ github.event.inputs.version_tag || 'latest' }}" >> $GITHUB_STEP_SUMMARY
+          echo "**Pushed to Registry:** ${{ github.event.inputs.push_to_registry }}" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "### Built Images:" >> $GITHUB_STEP_SUMMARY
+          if [ "${{ github.event.inputs.build_target }}" == "decentralized-api" ] || [ "${{ github.event.inputs.build_target }}" == "both" ]; then
+            echo "- \`${{ env.REGISTRY }}/${{ env.IMAGE_PREFIX }}/decentralized-api:${{ github.event.inputs.version_tag || 'latest' }}\`" >> $GITHUB_STEP_SUMMARY
+          fi
+          if [ "${{ github.event.inputs.build_target }}" == "inference-chain" ] || [ "${{ github.event.inputs.build_target }}" == "both" ]; then
+            echo "- \`${{ env.REGISTRY }}/${{ env.IMAGE_PREFIX }}/inferenced:${{ github.event.inputs.version_tag || 'latest' }}\`" >> $GITHUB_STEP_SUMMARY
+          fi

.github/workflows/test-workflow.yml

@@ -163,11 +163,16 @@ jobs:
       - name: Make Docker Images
         env:
           GENESIS_OVERRIDES_FILE: "inference-chain/test_genesis_overrides.json"
-          DEVSHARD_VERSION: "v0.2.11"
           USE_REGISTRY_CACHE: "1"
         run: |
           make build-docker
           make devshardd-build
+          echo "=== devshard version (make DEVSHARD_VERSION / build/devshard-version) ==="
+          make -s print-devshard-version
+          cat build/devshard-version
+          echo "=== devshard protocol version (DEVSHARD_PROTOCOL_VERSION / build/devshard-protocol-version) ==="
+          make -s print-devshard-protocol-version
+          cat build/devshard-protocol-version
           echo "=== Images immediately after build ==="
           docker images | head -20
 
@@ -195,7 +200,10 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: devshardd-host-binary
-          path: build/devshardd
+          path: |
+            build/devshardd
+            build/devshard-version
+            build/devshard-protocol-version
           retention-days: 1
 
       - name: Make Upgrade Build
@@ -261,6 +269,9 @@ jobs:
       - name: Prepare devshardd Host Binary
         run: |
           chmod +x build/devshardd
+          echo "=== devshard version stamp (for Testermint) ==="
+          cat build/devshard-version 2>/dev/null || echo "(missing build/devshard-version)"
+          cat build/devshard-protocol-version 2>/dev/null || echo "(missing build/devshard-protocol-version)"
 
       - name: Install Make
         run: |
@@ -294,17 +305,21 @@ jobs:
         if: ${{ inputs.use_matrix && inputs.test_command == 'run-tests' }}
         run: |
           echo "Running test group: ${{ matrix.test_group }}"
+          echo "devshard version stamp: $(cat build/devshard-version 2>/dev/null || echo missing)"
           sudo make run-tests TESTS="${{ matrix.test_group }}"
 
       - name: Run Tests (Matrix - Sanity)
         if: ${{ inputs.use_matrix && inputs.test_command == 'run-sanity' }}
         run: |
           echo "Running sanity test group: ${{ matrix.test_group }}"
+          echo "devshard version stamp: $(cat build/devshard-version 2>/dev/null || echo missing)"
           sudo make run-sanity TESTS="${{ matrix.test_group }}"
 
       - name: Run Tests (Non-Matrix)
         if: ${{ !inputs.use_matrix }}
-        run: sudo make ${{ inputs.test_command }}
+        run: |
+          echo "devshard version stamp: $(cat build/devshard-version 2>/dev/null || echo missing)"
+          sudo make ${{ inputs.test_command }}
       - name: Archive Test Results XML
         if: always()
         uses: actions/upload-artifact@v4

.github/workflows/verify.yml

@@ -9,6 +9,24 @@ on:
       - main
 
 jobs:
+  check-storage-ddl:
+    # Pinned runner because the ripgrep apt version below only exists in the
+    # 22.04 (jammy) package archive. Bumping the runner requires bumping the
+    # pinned ripgrep version in lockstep.
+    runs-on: ubuntu-22.04
+    name: Storage schema DDL guard
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Install ripgrep
+        # Pin the package version so the DDL guard runs against a known
+        # ripgrep build (reproducible CI). Update both pins together.
+        run: sudo apt-get update && sudo apt-get install -y ripgrep=13.0.0-2
+
+      - name: Check storage DDL placement
+        run: bash scripts/check-storage-ddl.sh
+
   build-and-test:
     runs-on: ubuntu-latest
     name: Build and Test chain
@@ -194,7 +212,7 @@ jobs:
           reporter: java-junit
 
   build-and-test-devshard:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: Build and Test Devshard
     permissions:
       contents: read
@@ -223,6 +241,10 @@ jobs:
       - name: Install dependencies
         run: go mod download
 
+      - name: Install ripgrep
+        # Pin the package version for reproducible CI; keep in sync with runner image.
+        run: sudo apt-get update && sudo apt-get install -y ripgrep=13.0.0-2
+
       - name: Build
         run: go build ./...
 

.gitignore

@@ -1,5 +1,6 @@
 vue/node_modules
 vue/dist
+/build/
 release/
 .idea/
 .vscode/
@@ -18,6 +19,7 @@ decentralized-api/responses/
 inference-chain/build/
 inference-chain/dist/
 /decentralized-api/decentralized-api
+/decentralized-api/devshardd
 chain-venv/
 .inference/
 prod-genesis/
@@ -44,8 +46,11 @@ run-parallel-tests/
 **/target/
 /tmp
 .worklog
+.metals
+actionlint
 
 # Generated proto artifacts (buf output in wrong location)
 inference-chain/proto/github.com/
 inference-chain/proto/api/
 inference-chain/proto/**/module/*.pb.go
+inference-chain/.docker-context

Makefile

@@ -1,7 +1,18 @@
-.PHONY: release decentralized-api-release inference-chain-release tmkms-release proxy-release proxy-ssl-release bridge-release versiond-release check-docker build-testermint run-blockchain-tests test-blockchain local-build api-local-build node-local-build api-test node-test mock-server-build-docker proxy-build-docker proxy-ssl-build-docker bridge-build-docker run-bls-tests devshardctl-build devshardd-build versiond-build-docker testapp-server-build-docker
+.PHONY: release decentralized-api-release inference-chain-release tmkms-release proxy-release proxy-ssl-release bridge-release versiond-release check-docker build-testermint run-blockchain-tests test-blockchain local-build api-local-build node-local-build api-test node-test mock-server-build-docker proxy-build-docker proxy-ssl-build-docker bridge-build-docker run-bls-tests devshardctl-build devshardd-build print-devshard-version print-devshard-protocol-version versiond-build-docker testapp-server-build-docker
+
+include scripts/blst-portable.mk
 
 VERSION ?= $(shell git describe --always)
+# devshardd link stamp; Testermint VERSIOND_FORCE follows this via build/devshard-version or `make print-devshard-version`.
 DEVSHARD_VERSION ?= dev
+# State-root / settlement protocol tag (not versiond runtime name). See devshard/docs/protocol-version.md.
+DEVSHARD_PROTOCOL_VERSION ?= v2
+
+print-devshard-version:
+	@echo $(DEVSHARD_VERSION)
+
+print-devshard-protocol-version:
+	@echo $(DEVSHARD_PROTOCOL_VERSION)
 TAG_NAME := "release/v$(VERSION)"
 USE_REGISTRY_CACHE ?= 0
 ifeq ($(USE_REGISTRY_CACHE),1)
@@ -21,16 +32,21 @@ all: build-docker
 build-docker: api-build-docker node-build-docker mock-server-build-docker proxy-build-docker proxy-ssl-build-docker bridge-build-docker versiond-build-docker testapp-server-build-docker
 
 api-build-docker:
-	@make -C decentralized-api build-docker SET_LATEST=1
+	@make -C decentralized-api build-docker SET_LATEST=1 \
+		BLST_PORTABLE=$(BLST_PORTABLE) \
+		DOCKER_PLATFORM=$(DOCKER_PLATFORM) DOCKER_GOOS=$(DOCKER_GOOS) DOCKER_GOARCH=$(DOCKER_GOARCH)
 
 node-build-docker:
-	@make -C inference-chain build-docker SET_LATEST=1 $(if $(GENESIS_OVERRIDES_FILE),GENESIS_OVERRIDES_FILE=$(GENESIS_OVERRIDES_FILE),)
+	@make -C inference-chain build-docker SET_LATEST=1 \
+		BLST_PORTABLE=$(BLST_PORTABLE) \
+		DOCKER_PLATFORM=$(DOCKER_PLATFORM) DOCKER_GOOS=$(DOCKER_GOOS) DOCKER_GOARCH=$(DOCKER_GOARCH) \
+		$(if $(GENESIS_OVERRIDES_FILE),GENESIS_OVERRIDES_FILE=$(GENESIS_OVERRIDES_FILE),)
 
 mock-server-build-docker:
 	@echo "Building mock-server JAR file..."
 	@cd testermint/mock_server && ./gradlew clean && ./gradlew shadowJar
 	@echo "Building mock-server docker image..."
-	@$(_MOCK_BUILD_CMD) -t inference-mock-server -f testermint/Dockerfile testermint
+	@$(_MOCK_BUILD_CMD) --platform $(DOCKER_PLATFORM) -t inference-mock-server -f testermint/Dockerfile testermint
 
 proxy-build-docker:
 	@make -C proxy build-docker SET_LATEST=1
@@ -42,12 +58,12 @@ bridge-build-docker:
 	@make -C bridge build-docker SET_LATEST=1
 
 versiond-build-docker:
-	@echo "Building versiond docker image..."
-	@docker build -t versiond:latest -f versioned/Dockerfile versioned
+	@echo "Building versiond docker image ($(DOCKER_PLATFORM), matches devshardd-build)..."
+	@docker build --platform $(DOCKER_PLATFORM) -t versiond:latest -f versioned/Dockerfile versioned
 
 testapp-server-build-docker:
-	@echo "Building testapp-server docker image..."
-	@docker build -t testapp-server:latest -f local-test-net/Dockerfile.testapp-server .
+	@echo "Building testapp-server docker image ($(DOCKER_PLATFORM))..."
+	@docker build --platform $(DOCKER_PLATFORM) -t testapp-server:latest -f local-test-net/Dockerfile.testapp-server .
 
 release: decentralized-api-release inference-chain-release tmkms-release proxy-release proxy-ssl-release bridge-release versiond-release
 	@git tag $(TAG_NAME)
@@ -113,24 +129,29 @@ api-local-build:
 	@echo "Building decentralized-api locally..."
 	@cd decentralized-api && go build -mod=mod -o ./build/dapi
 
+DEVSHARD_PROTOCOL_LDFLAGS = -X devshard/types.buildStateRootProtocolVersion=$(DEVSHARD_PROTOCOL_VERSION)
+
 devshardctl-build:
-	@echo "Building devshardctl..."
-	@cd devshard && go build -ldflags "-X main.Version=$(DEVSHARD_VERSION)" -o ../build/devshardctl ./cmd/devshardctl/
+	@echo "Building devshardctl (DEVSHARD_PROTOCOL_VERSION=$(DEVSHARD_PROTOCOL_VERSION))..."
+	@cd devshard && go build -ldflags "-X main.Version=$(DEVSHARD_VERSION) $(DEVSHARD_PROTOCOL_LDFLAGS)" -o ../build/devshardctl ./cmd/devshardctl/
 
 devshardd-build:
-	@echo "Building devshardd..."
+	@echo "Building devshardd (DEVSHARD_VERSION=$(DEVSHARD_VERSION) DEVSHARD_PROTOCOL_VERSION=$(DEVSHARD_PROTOCOL_VERSION))..."
 	@mkdir -p build
-	@$(_DEVSHARDD_BUILD_CMD) --platform linux/amd64 --target builder \
-		--build-arg GOOS=linux \
-		--build-arg GOARCH=amd64 \
+	@$(_DEVSHARDD_BUILD_CMD) --platform $(DOCKER_PLATFORM) --target builder \
+		--build-arg GOOS=$(DOCKER_GOOS) \
+		--build-arg GOARCH=$(DOCKER_GOARCH) \
 		--build-arg BLST_PORTABLE=1 \
 		--build-arg DEVSHARD_VERSION=$(DEVSHARD_VERSION) \
+		--build-arg DEVSHARD_PROTOCOL_VERSION=$(DEVSHARD_PROTOCOL_VERSION) \
 		-f decentralized-api/Dockerfile . \
 		-t devshardd-builder:latest -q >/dev/null
 	@CID=$$(docker create devshardd-builder:latest) && \
 		docker cp $$CID:/app/decentralized-api/build/devshardd build/devshardd && \
 		docker rm $$CID >/dev/null
 	@chmod +x build/devshardd
+	@echo "$(DEVSHARD_VERSION)" > build/devshard-version
+	@echo "$(DEVSHARD_PROTOCOL_VERSION)" > build/devshard-protocol-version
 	@echo "Built build/devshardd ($$(file build/devshardd | grep -o 'statically linked\|dynamically linked'))"
 
 node-local-build:

bridge/Makefile

@@ -1,5 +1,7 @@
 .PHONY: all build-docker docker-push release
 
+include ../scripts/blst-portable.mk
+
 VERSION ?= $(shell git describe --always)
 SET_LATEST ?= 0
 SET_LATEST := $(shell if [ "$(SET_LATEST)" = "1" ]; then echo 1; else echo 0; fi)
@@ -25,7 +27,7 @@ endef
 all: build-docker
 
 build-docker:
-	$(eval PLATFORM=linux/amd64)
+	$(eval PLATFORM=$(DOCKER_PLATFORM))
 	$(eval DOCKER_FILE=Dockerfile)
 	$(eval DOCKER_TAG=ghcr.io/product-science/bridge:$(VERSION))
 	$(DOCKER_BUILD)