merge: fix/zoo-industries-semver-pin
This commit is contained in:
@@ -71,7 +71,7 @@ jobs:
|
||||
KMS_CLIENT_SECRET: ${{ secrets.KMS_CLIENT_SECRET }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
KMS_URL="https://kms.main."
|
||||
KMS_URL="${KMS_URL:-https://kms.<your-domain>}"
|
||||
WORKSPACE="zoo-platform"
|
||||
|
||||
ACCESS_TOKEN="$(
|
||||
@@ -143,7 +143,7 @@ jobs:
|
||||
KMS_CLIENT_SECRET: ${{ secrets.KMS_CLIENT_SECRET }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
KMS_URL="https://kms.main."
|
||||
KMS_URL="${KMS_URL:-https://kms.<your-domain>}"
|
||||
WORKSPACE="zoo-platform"
|
||||
|
||||
ACCESS_TOKEN="$(
|
||||
@@ -267,7 +267,7 @@ jobs:
|
||||
KMS_CLIENT_SECRET: ${{ secrets.KMS_CLIENT_SECRET }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
KMS_URL="https://kms.main."
|
||||
KMS_URL="${KMS_URL:-https://kms.<your-domain>}"
|
||||
WORKSPACE="zoo-platform"
|
||||
|
||||
ACCESS_TOKEN="$(
|
||||
|
||||
@@ -136,7 +136,7 @@ jobs:
|
||||
KMS_CLIENT_SECRET: ${{ secrets.KMS_CLIENT_SECRET }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
KMS_URL="https://kms.main."
|
||||
KMS_URL="${KMS_URL:-https://kms.<your-domain>}"
|
||||
WORKSPACE="zoo-platform"
|
||||
|
||||
ACCESS_TOKEN="$(
|
||||
@@ -230,7 +230,7 @@ jobs:
|
||||
KMS_CLIENT_SECRET: ${{ secrets.KMS_CLIENT_SECRET }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
KMS_URL="https://kms.main."
|
||||
KMS_URL="${KMS_URL:-https://kms.<your-domain>}"
|
||||
WORKSPACE="zoo-platform"
|
||||
|
||||
ACCESS_TOKEN="$(
|
||||
@@ -308,7 +308,7 @@ jobs:
|
||||
KMS_CLIENT_SECRET: ${{ secrets.KMS_CLIENT_SECRET }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
KMS_URL="https://kms.main."
|
||||
KMS_URL="${KMS_URL:-https://kms.<your-domain>}"
|
||||
WORKSPACE="zoo-platform"
|
||||
|
||||
ACCESS_TOKEN="$(
|
||||
@@ -377,7 +377,7 @@ jobs:
|
||||
KMS_CLIENT_SECRET: ${{ secrets.KMS_CLIENT_SECRET }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
KMS_URL="https://kms.main."
|
||||
KMS_URL="${KMS_URL:-https://kms.<your-domain>}"
|
||||
WORKSPACE="zoo-platform"
|
||||
|
||||
ACCESS_TOKEN="$(
|
||||
|
||||
@@ -22,9 +22,10 @@ on:
|
||||
- ngo
|
||||
- docs
|
||||
- zips
|
||||
# Explorer is upstream Blockscout — Zoo does not ship its own image.
|
||||
# Listed here as a no-op acknowledgement so a stray dispatch doesn't
|
||||
# 404 the sender; the validate step rejects the bump explicitly.
|
||||
# Explorer is the upstream Lux Go binary (ghcr.io/luxfi/explorer) —
|
||||
# Zoo does not ship its own explorer image. Listed here as a no-op
|
||||
# acknowledgement so a stray dispatch doesn't 404 the sender; the
|
||||
# validate step rejects the bump explicitly.
|
||||
- explorer
|
||||
|
||||
permissions:
|
||||
@@ -49,11 +50,11 @@ jobs:
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Explorer is upstream Blockscout — refuse to auto-bump from
|
||||
# a zooai/explorer dispatch, since k8s/base/explorer.yaml pins
|
||||
# blockscout/blockscout:<sha> upstream.
|
||||
# Explorer is the Lux Go binary upstream — refuse to auto-bump
|
||||
# from a zooai/explorer dispatch, since k8s/base/explorer.yaml
|
||||
# pins ghcr.io/luxfi/explorer:<semver> upstream.
|
||||
if [ "$SERVICE" = "explorer" ]; then
|
||||
echo "::notice::explorer pins blockscout/blockscout upstream — ignoring dispatch"
|
||||
echo "::notice::explorer pins ghcr.io/luxfi/explorer upstream — ignoring dispatch"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
|
||||
@@ -107,7 +107,7 @@ Tests match the lux/universe structure. Run against production by default.
|
||||
```bash
|
||||
npm test # Run all tests
|
||||
npm run test:health # Zoo chain RPC + health
|
||||
npm run test:explorer # Zoo explorer (Blockscout)
|
||||
npm run test:explorer # Zoo explorer (Lux Go binary)
|
||||
npm run test:exchange # zoo.exchange UI
|
||||
npm run test:parent # Cross-chain with Lux
|
||||
LUX_NETWORK=testnet npm test # Test against testnet
|
||||
@@ -143,7 +143,7 @@ All Zoo-built workloads MUST pull from `ghcr.io/zooai/*`. No exceptions:
|
||||
branch tag like `:main` only as fallback while CI ships semver).
|
||||
|
||||
Upstream OSS images are fine where Zoo doesn't fork the binary:
|
||||
- `blockscout/blockscout:<sha>` for explorer
|
||||
- `ghcr.io/luxfi/explorer:<semver>` — single Go binary (indexer+GraphQL+SPA)
|
||||
- `traefik:v3.3` for ingress
|
||||
- `ghcr.io/hanzoai/sql:18`, `ghcr.io/hanzoai/kv:9` — Zoo consumes the
|
||||
Hanzo OSS infra images unmodified
|
||||
@@ -156,7 +156,7 @@ Upstream OSS images are fine where Zoo doesn't fork the binary:
|
||||
| `base/operator.yaml` | `ghcr.io/zooai/operator:main` | branch tag | TODO: pin semver |
|
||||
| `base/bridge.yaml` | `ghcr.io/zooai/bridge:main` | branch tag | TODO: pin semver |
|
||||
| `base/ingress.yaml` | `traefik:v3.3` | semver | upstream |
|
||||
| `base/explorer.yaml` | `blockscout/blockscout:7.0.2.commit.900ef697` | release SHA | upstream Blockscout |
|
||||
| `base/explorer.yaml` | `ghcr.io/luxfi/explorer:1.2.1` | semver | Lux Go binary (indexer+GraphQL+SPA) |
|
||||
| `base/sql.yaml` | `ghcr.io/hanzoai/sql:18` | semver | OSS infra |
|
||||
| `base/kv.yaml` | `ghcr.io/hanzoai/kv:9` | semver | OSS infra |
|
||||
| `base/ngo.yaml` | `ghcr.io/zooai/ngo:latest` | latest | image not built; manifest scaffolding |
|
||||
|
||||
+3
-3
@@ -136,7 +136,7 @@ All chains exposed via ZooGateway at `api.zoo.ngo`:
|
||||
| `/v1/oracle` | zoo-oracle | Oracle data feeds |
|
||||
| `/v1/relay` | zoo-relay | Cross-chain relay |
|
||||
| `/v1/beluga` | beluga | Beluga L3 EVM JSON-RPC |
|
||||
| `/v1/explorer` | zoo-explorer | Blockscout explorer |
|
||||
| `/v1/explorer` | zoo-explorer | Lux explorer (Go binary) |
|
||||
|
||||
## Deploy
|
||||
|
||||
@@ -155,7 +155,7 @@ All chains exposed via ZooGateway at `api.zoo.ngo`:
|
||||
| zoo-operator | Deployment | 1 (system only) | ghcr.io/zooai/operator |
|
||||
| zoo-chain | ZooNetwork CR | 1/3/5 (GPU) | ghcr.io/zooai/zoo-node |
|
||||
| zoo-bridge | Deployment | 1/1/2 | ghcr.io/zooai/zoo-bridge |
|
||||
| zoo-explorer | Deployment | 1/1/2 | blockscout/blockscout |
|
||||
| zoo-explorer | Deployment | 1/1/2 | ghcr.io/luxfi/explorer |
|
||||
| sql | StatefulSet | 1/1/1 | ghcr.io/hanzoai/sql:18 |
|
||||
| kv | StatefulSet | 1/1/1 | ghcr.io/hanzoai/kv:9 |
|
||||
| zoo-ingress | Deployment | 1/1/2 | ghcr.io/hanzoai/ingress |
|
||||
@@ -176,7 +176,7 @@ k8s/
|
||||
sql.yaml # PostgreSQL (hanzoai/sql:18)
|
||||
kv.yaml # Valkey (hanzoai/kv:9)
|
||||
bridge.yaml # Cross-chain bridge (uses M-Chain signing)
|
||||
explorer.yaml # Blockscout explorer
|
||||
explorer.yaml # Lux explorer (Go binary)
|
||||
gateway.yaml # ZooGateway (routes to all 15 chain RPCs + Beluga)
|
||||
ingress.yaml # Ingress + routes
|
||||
kustomization.yaml
|
||||
|
||||
+19
-31
@@ -1,4 +1,5 @@
|
||||
# Explorer — Blockscout for Zoo EVM chain
|
||||
# Explorer — Lux explorer (single Go binary) for Zoo EVM chain.
|
||||
# Indexer + GraphQL + SPA in one process, no Postgres, on :8090.
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
@@ -22,32 +23,16 @@ spec:
|
||||
- name: hanzo
|
||||
containers:
|
||||
- name: explorer
|
||||
# Blockscout upstream image. zooai/explorer is the source repo
|
||||
# (Blockscout fork) and does not publish to ghcr.io/zooai/explorer
|
||||
# — Zoo runs the upstream binary unmodified. Pinned to a real
|
||||
# release SHA tag instead of :latest.
|
||||
image: blockscout/blockscout:7.0.2.commit.900ef697
|
||||
image: ghcr.io/luxfi/explorer:1.2.1
|
||||
ports:
|
||||
- containerPort: 4000
|
||||
- containerPort: 8090
|
||||
name: http
|
||||
env:
|
||||
- name: ETHEREUM_JSONRPC_VARIANT
|
||||
value: geth
|
||||
- name: ETHEREUM_JSONRPC_HTTP_URL
|
||||
value: http://zoo-rpc:9650/ext/bc/zoo/rpc
|
||||
- name: DATABASE_URL
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: zoo-db-credentials
|
||||
key: explorer-url
|
||||
- name: NETWORK
|
||||
value: Zoo
|
||||
- name: SUBNETWORK
|
||||
value: Zoo EVM
|
||||
- name: COIN
|
||||
value: ZOO
|
||||
- name: LOGO
|
||||
value: /images/zoo-logo.svg
|
||||
- name: CHAINS
|
||||
value: zoo:http://zoo-rpc.zoo.svc.cluster.local:9650/ext/bc/zoo/rpc
|
||||
volumeMounts:
|
||||
- name: data
|
||||
mountPath: /data
|
||||
resources:
|
||||
requests:
|
||||
cpu: 250m
|
||||
@@ -57,16 +42,19 @@ spec:
|
||||
memory: 2Gi
|
||||
livenessProbe:
|
||||
httpGet:
|
||||
path: /
|
||||
port: 4000
|
||||
path: /health
|
||||
port: 8090
|
||||
initialDelaySeconds: 30
|
||||
periodSeconds: 15
|
||||
readinessProbe:
|
||||
httpGet:
|
||||
path: /
|
||||
port: 4000
|
||||
initialDelaySeconds: 20
|
||||
path: /health
|
||||
port: 8090
|
||||
initialDelaySeconds: 10
|
||||
periodSeconds: 10
|
||||
volumes:
|
||||
- name: data
|
||||
emptyDir: {}
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
@@ -80,6 +68,6 @@ spec:
|
||||
selector:
|
||||
app: zoo-explorer
|
||||
ports:
|
||||
- port: 4000
|
||||
targetPort: 4000
|
||||
- port: 8090
|
||||
targetPort: 8090
|
||||
name: http
|
||||
|
||||
@@ -30,7 +30,7 @@ spec:
|
||||
schema:
|
||||
openAPIV3Schema:
|
||||
type: object
|
||||
description: ZooExplorer manages Blockscout explorer instances for Zoo chains.
|
||||
description: ZooExplorer manages Lux explorer (Go binary) instances for Zoo chains.
|
||||
properties:
|
||||
apiVersion:
|
||||
type: string
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
# Zoo mainnet EVM L2 — luxd RLP import spec.
|
||||
#
|
||||
# Source of truth for the one-time historic-state restore on the Zoo L2 EVM
|
||||
# (chainId 200200) that runs as a tenant on Lux Network mainnet validators.
|
||||
#
|
||||
# Until the lux-operator grows a LuxNetwork.spec.tenantImports[] field
|
||||
# (TODO upstream luxfi/operator), the actual startup.sh on luxd pods
|
||||
# composes this block inline in lux/universe k8s/lux-mainnet/luxd-startup.yaml.
|
||||
# This file is the canonical record of Zoo's contribution to that file.
|
||||
#
|
||||
# Refactor plan:
|
||||
# 1. luxfi/operator adds tenantImports field to LuxNetwork CRD
|
||||
# 2. Operator builds startup.sh from base (C-Chain) + each tenant entry
|
||||
# 3. zoo/universe deploys this manifest standalone; it Mutates LuxNetwork
|
||||
# luxd CR in lux-mainnet ns via SSA to add a tenantImports entry
|
||||
#
|
||||
# Today the cluster reflects the inline form. Edits to Zoo's import spec
|
||||
# must coordinate with the lux team to update lux/universe luxd-startup.yaml.
|
||||
apiVersion: lux.network/v1alpha1
|
||||
kind: TenantImport
|
||||
metadata:
|
||||
name: zoo-mainnet-200200
|
||||
namespace: lux-mainnet
|
||||
labels:
|
||||
app.kubernetes.io/part-of: zoo-network
|
||||
lux.network/tenant: zoo
|
||||
spec:
|
||||
chainAlias: zoo
|
||||
chainID: 200200
|
||||
vmID: vvSpHzUWYVAYgEwQBTfc6Nd8PGXRmDaLaFYgrGCuQKKRKzY2v
|
||||
blockchainID: 2wbPWcyuNUimWW7YMq3gymTTpHjP9Lsm7GpmcyWimEs9kyTAAH
|
||||
rlpFile: /data/zoo-mainnet-200200.rlp
|
||||
rlpSource:
|
||||
type: git
|
||||
repo: github.com/luxfi/state
|
||||
commit: df8c246
|
||||
path: exports/zoo-mainnet-200200/blocks.rlp
|
||||
sha256: 0850841a368dd1f85ae09d40f0552aecb679225b58ce4524b2d0a3337c7afc98
|
||||
sizeBytes: 1356798
|
||||
blocks: 800
|
||||
sentinel: /data/.zoo_rlp_imported_v1
|
||||
chaindataDir: /data/chainData/network-1/2wbPWcyuNUimWW7YMq3gymTTpHjP9Lsm7GpmcyWimEs9kyTAAH
|
||||
importedAt: "2026-05-25T23:01:33Z"
|
||||
importedVia: admin_importChain
|
||||
tipBlock: 799
|
||||
tipHash: "0xd6f92941bb2ac91dfd2443f32b0d93f2730e6cc81ddb2edd3f35720a9e1f72b8"
|
||||
@@ -0,0 +1,124 @@
|
||||
# zoo.industries — static marketing site served by hanzoai/spa runtime
|
||||
# on the canonical content image at ghcr.io/zooai/zoo-industries.
|
||||
# Raw K8s shape (Deployment + Service + Ingress); migrate to a
|
||||
# kind: SPA CR once hanzoai/operator is installed on this cluster.
|
||||
---
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: zoo-industries
|
||||
namespace: zoo-mainnet
|
||||
labels:
|
||||
app.kubernetes.io/name: zoo-industries
|
||||
app.kubernetes.io/part-of: zoo
|
||||
app.kubernetes.io/component: marketing-site
|
||||
spec:
|
||||
replicas: 2
|
||||
strategy:
|
||||
type: RollingUpdate
|
||||
rollingUpdate:
|
||||
maxSurge: 1
|
||||
maxUnavailable: 0
|
||||
selector:
|
||||
matchLabels:
|
||||
app.kubernetes.io/name: zoo-industries
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app.kubernetes.io/name: zoo-industries
|
||||
app.kubernetes.io/part-of: zoo
|
||||
spec:
|
||||
imagePullSecrets:
|
||||
- name: ghcr-secret
|
||||
- name: hanzo
|
||||
- name: ghcr-credentials-hanzodev
|
||||
containers:
|
||||
- name: spa
|
||||
# Content image built from the zoo.industries repo Dockerfile
|
||||
# (FROM ghcr.io/hanzoai/spa:1.2.0 + COPY out/ /public/).
|
||||
# Bump the tag to roll a new deploy.
|
||||
image: ghcr.io/zooai/zoo-industries:sha-8e93f08-amd64
|
||||
imagePullPolicy: Always
|
||||
ports:
|
||||
- name: http
|
||||
containerPort: 3000
|
||||
env:
|
||||
- name: SPA_API_HOST
|
||||
value: https://api.zoo.ngo
|
||||
- name: SPA_IAM_HOST
|
||||
value: https://zoo.id
|
||||
- name: SPA_ENV
|
||||
value: prod
|
||||
resources:
|
||||
requests:
|
||||
cpu: 50m
|
||||
memory: 64Mi
|
||||
limits:
|
||||
cpu: 500m
|
||||
memory: 256Mi
|
||||
readinessProbe:
|
||||
httpGet:
|
||||
path: /health
|
||||
port: 3000
|
||||
initialDelaySeconds: 2
|
||||
periodSeconds: 5
|
||||
livenessProbe:
|
||||
httpGet:
|
||||
path: /health
|
||||
port: 3000
|
||||
initialDelaySeconds: 10
|
||||
periodSeconds: 15
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: zoo-industries
|
||||
namespace: zoo-mainnet
|
||||
labels:
|
||||
app.kubernetes.io/name: zoo-industries
|
||||
spec:
|
||||
type: ClusterIP
|
||||
selector:
|
||||
app.kubernetes.io/name: zoo-industries
|
||||
ports:
|
||||
- name: http
|
||||
port: 80
|
||||
targetPort: 3000
|
||||
---
|
||||
apiVersion: networking.k8s.io/v1
|
||||
kind: Ingress
|
||||
metadata:
|
||||
name: zoo-industries
|
||||
namespace: zoo-mainnet
|
||||
labels:
|
||||
app.kubernetes.io/name: zoo-industries
|
||||
annotations:
|
||||
cert-manager.io/cluster-issuer: letsencrypt-prod
|
||||
kubernetes.io/ingress.class: ingress
|
||||
spec:
|
||||
rules:
|
||||
- host: zoo.industries
|
||||
http:
|
||||
paths:
|
||||
- backend:
|
||||
service:
|
||||
name: zoo-industries
|
||||
port:
|
||||
number: 80
|
||||
path: /
|
||||
pathType: Prefix
|
||||
- host: www.zoo.industries
|
||||
http:
|
||||
paths:
|
||||
- backend:
|
||||
service:
|
||||
name: zoo-industries
|
||||
port:
|
||||
number: 80
|
||||
path: /
|
||||
pathType: Prefix
|
||||
tls:
|
||||
- hosts:
|
||||
- zoo.industries
|
||||
- www.zoo.industries
|
||||
secretName: zoo-industries-tls
|
||||
Reference in New Issue
Block a user