Skip to content

Commit f23818a

Browse files
yashnevatiaamit-mominapp-token-issuer-engops[bot]cawthornenadahalli
authored
Chore sync cap-dev with main (#340)
* Add Pharos Atlantic support (#306) * Added Pharos Atlantic support * Auto-fix: buf format, gofmt, go generate, go mod tidy --------- Co-authored-by: app-token-issuer-engops[bot] <144731339+app-token-issuer-engops[bot]@users.noreply.github.com> * aptos proto: add ledger_version to ViewRequest (#310) * aptos proto: add ledger_version to ViewRequest * Auto-fix: buf format, gofmt, go generate, go mod tidy --------- Co-authored-by: app-token-issuer-engops[bot] <144731339+app-token-issuer-engops[bot]@users.noreply.github.com> * Add xlayer, megaeth, cronos, mantle, tac, unichain, scroll, sonic testnet support (#308) * Added xlayer megaeth cronos mantle tac unichain scroll sonic support * Auto-fix: buf format, gofmt, go generate, go mod tidy * Added celo sepolia * Auto-fix: buf format, gofmt, go generate, go mod tidy * Added gnosis chiado * Auto-fix: buf format, gofmt, go generate, go mod tidy * Removed celo sepolia * Auto-fix: buf format, gofmt, go generate, go mod tidy * Removed gnosis chiado * Auto-fix: buf format, gofmt, go generate, go mod tidy --------- Co-authored-by: app-token-issuer-engops[bot] <144731339+app-token-issuer-engops[bot]@users.noreply.github.com> * Add andesite chain (#313) * Added andesite chain * Auto-fix: buf format, gofmt, go generate, go mod tidy --------- Co-authored-by: app-token-issuer-engops[bot] <144731339+app-token-issuer-engops[bot]@users.noreply.github.com> * Add new mainnet chains to client proto (#315) * Added new mainnet chains to client proto * Auto-fix: buf format, gofmt, go generate, go mod tidy --------- Co-authored-by: app-token-issuer-engops[bot] <144731339+app-token-issuer-engops[bot]@users.noreply.github.com> * Remove aptos (moved to capabilities-development branch) (#316) * remove aptos * Auto-fix: buf format, gofmt, go generate, go mod tidy --------- Co-authored-by: app-token-issuer-engops[bot] <144731339+app-token-issuer-engops[bot]@users.noreply.github.com> * Add owner and execution_id to WorkflowExecution proto (#317) Adds workflow-level context to the app-specific proto rather than the generic ComputeRequest type, per vreff's feedback on CC PR #277. The enclave app reads these from the deserialized WorkflowExecution for runtime secret fetching from VaultDON via the relay DON. * Add Privacy as codeowners of protos embedded gen files (#318) * feat: add NodeBuildInfo proto and register it in chip schemas (#320) * Revert "Remove aptos (moved to capabilities-development branch) (#316)" (#321) This reverts commit 1124ff8. * Add hyperliquid mainnet to client proto (#322) * Added hyperliquid mainnet to client proto * Auto-fix: buf format, gofmt, go generate, go mod tidy --------- Co-authored-by: app-token-issuer-engops[bot] <144731339+app-token-issuer-engops[bot]@users.noreply.github.com> * Add gnosis chiado to client proto (#324) * Added gnosis chiado to client proto * Auto-fix: buf format, gofmt, go generate, go mod tidy --------- Co-authored-by: app-token-issuer-engops[bot] <144731339+app-token-issuer-engops[bot]@users.noreply.github.com> * add WorkflowUserMetric (#319) * add WorkflowUserMetric * fix metric suffix * bot: regenerate protobuf files * add USER_METRIC_TYPE_UNSPECIFIED * bot: regenerate protobuf files * update WorkflowUserMetric value to double * drop histogram support * bot: regenerate protobuf files --------- Co-authored-by: app-token-issuer-engops[bot] <144731339+app-token-issuer-engops[bot]@users.noreply.github.com> * Revert "Revert "Remove aptos (moved to capabilities-development branch) (#316…" (#331) This reverts commit ad04ed6. * Add capability-development branch protection CI (#327) * Add capability-development branch protection ci * Upgraded checkout action to major version tag * Updated validation to only occur when target branch is main * Addressed feedback * beholder: publish workflows/v2/workflow_user_metric (#333) * beholder: publish workflows/v2/workflow_user_metric.proto * remove entry from deprecated files * cre-1835: steady and transition indicators (#334) --------- Co-authored-by: amit-momin <108959691+amit-momin@users.noreply.github.com> Co-authored-by: app-token-issuer-engops[bot] <144731339+app-token-issuer-engops[bot]@users.noreply.github.com> Co-authored-by: cawthorne <cawthornegd@gmail.com> Co-authored-by: Tejaswi Nadahalli <tejaswi.nadahalli@smartcontract.com> Co-authored-by: vreff <104409744+vreff@users.noreply.github.com> Co-authored-by: Gheorghe Strimtu <studentcuza@gmail.com> Co-authored-by: karen-stepanyan <91897037+karen-stepanyan@users.noreply.github.com> Co-authored-by: mchain0 <maciej.wisniewski@smartcontract.com>
1 parent 5b99921 commit f23818a

4 files changed

Lines changed: 123 additions & 2 deletions

File tree

‎.github/workflows/cre-branch-protection.yml‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
name: CRE branch protection
2+
3+
on:
4+
pull_request:
5+
types: [opened, reopened, synchronize]
6+
branches:
7+
- main
8+
9+
permissions: {}
10+
11+
jobs:
12+
check-cre-target-branch:
13+
permissions:
14+
contents: read
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v6
18+
with:
19+
fetch-depth: 0
20+
21+
- name: Enforce CRE changes target capabilities-development
22+
env:
23+
TARGET_BRANCH: ${{ github.base_ref }}
24+
run: |
25+
git fetch origin "${TARGET_BRANCH}" --quiet 2>/dev/null || true
26+
27+
CRE_CHANGED=$(git diff --name-only "origin/${TARGET_BRANCH}...HEAD" -- cre/)
28+
29+
if [[ -z "$CRE_CHANGED" ]]; then
30+
echo "No cre/ files modified. Skipping branch check."
31+
exit 0
32+
fi
33+
34+
echo "The following cre/ files are modified in this PR:"
35+
echo "$CRE_CHANGED"
36+
echo ""
37+
38+
echo "PR targets 'main' and contains cre/ changes."
39+
echo "Verifying all CRE-modifying commits are cherry-picks from capabilities-development..."
40+
echo ""
41+
42+
if ! git fetch origin capabilities-development --quiet 2>/dev/null; then
43+
echo "::error::Could not fetch the 'capabilities-development' branch. Ensure it exists on the remote."
44+
echo "::error::CRE changes must target 'capabilities-development' or be cherry-picks of commits already in that branch."
45+
exit 1
46+
fi
47+
48+
# Precompute patch-ids for all CRE-touching commits in capabilities-development
49+
CAP_PATCH_IDS=$(mktemp)
50+
git log --format=%H origin/capabilities-development -- cre/ | while read -r cap_commit; do
51+
git show "$cap_commit" -- cre/ | git patch-id --stable 2>/dev/null | awk '{print $1}'
52+
done | sort -u > "$CAP_PATCH_IDS"
53+
54+
CAP_COUNT=$(wc -l < "$CAP_PATCH_IDS" | tr -d ' ')
55+
echo "Found ${CAP_COUNT} unique CRE patch-ids in capabilities-development."
56+
echo ""
57+
58+
# Check each PR commit that touches cre/
59+
FAILURES=$(mktemp)
60+
git log --format=%H "origin/${TARGET_BRANCH}..HEAD" -- cre/ | while read -r commit; do
61+
PATCH_ID=$(git show "$commit" -- cre/ | git patch-id --stable 2>/dev/null | awk '{print $1}')
62+
63+
if [ -z "$PATCH_ID" ]; then
64+
continue
65+
fi
66+
67+
if ! grep -qF "$PATCH_ID" "$CAP_PATCH_IDS"; then
68+
git log -1 --format='%h %s' "$commit" >> "$FAILURES"
69+
fi
70+
done
71+
72+
if [ -s "$FAILURES" ]; then
73+
echo "::error::The following commits modify cre/ but are not cherry-picks of commits in capabilities-development:"
74+
echo ""
75+
while IFS= read -r line; do
76+
echo " - ${line}"
77+
done < "$FAILURES"
78+
echo ""
79+
echo "::error::CRE changes must first be merged into 'capabilities-development'. PRs to other branches may only include cherry-picks of commits already in that branch."
80+
rm -f "$CAP_PATCH_IDS" "$FAILURES"
81+
exit 1
82+
fi
83+
84+
rm -f "$CAP_PATCH_IDS" "$FAILURES"
85+
echo "All CRE-modifying commits are verified cherry-picks from capabilities-development."

‎ring/go/shard_orchestrator.pb.go‎

Lines changed: 20 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ring/pb/shard_orchestrator.proto‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ message GetWorkflowShardMappingResponse {
1818
map<string, uint32> mappings = 1;
1919
map<string, WorkflowMappingState> mapping_states = 2;
2020
uint64 mapping_version = 3;
21+
uint64 routing_state_id = 4;
22+
bool routing_steady = 5;
2123
}
2224

2325
message ReportWorkflowTriggerRegistrationRequest {

‎workflows/chip-cre.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,22 @@
347347
}
348348
]
349349
},
350+
{
351+
"entity": "workflows.v2.WorkflowUserMetric",
352+
"path": "workflows/v2/workflow_user_metric.proto",
353+
"references": [
354+
{
355+
"name": "workflows/v2/cre_info.proto",
356+
"entity": "workflows.v2.CreInfo",
357+
"path": "workflows/v2/cre_info.proto"
358+
},
359+
{
360+
"name": "workflows/v2/workflow_key.proto",
361+
"entity": "workflows.v2.WorkflowKey",
362+
"path": "workflows/v2/workflow_key.proto"
363+
}
364+
]
365+
},
350366
{
351367
"entity": "bridge_status.v1.JobInfo",
352368
"path": "bridge_status/v1/job_info.proto"

0 commit comments

Comments
 (0)