Skip to content

Commit 7968e0e

Browse files
achamayouachamayou
authored
Merge branch 'main' into respond_at_commit
2 parents dfaaaaa + 8093d91 commit 7968e0e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1368
-926
lines changed

‎.github/workflows/bencher-ab.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
PYTHONPATH=../tests python convert_pico_to_bencher.py
5959
6060
- name: Upload PR results
61-
uses: actions/upload-artifact@v6
61+
uses: actions/upload-artifact@v7
6262
with:
6363
name: benchmark-pr-${{ github.run_id }}
6464
path: build/bencher.json
@@ -109,7 +109,7 @@ jobs:
109109
PYTHONPATH=../tests python convert_pico_to_bencher.py
110110
111111
- name: Upload main results
112-
uses: actions/upload-artifact@v6
112+
uses: actions/upload-artifact@v7
113113
with:
114114
name: benchmark-main-${{ github.run_id }}
115115
path: build/bencher.json
@@ -137,7 +137,7 @@ jobs:
137137
- uses: actions/checkout@v6
138138

139139
- name: Download artifacts
140-
uses: actions/download-artifact@v7
140+
uses: actions/download-artifact@v8
141141
with:
142142
pattern: benchmark-*-${{ github.run_id }}
143143
merge-multiple: false

‎.github/workflows/ci-verification.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
- run: cd tla && ./tlc.py mc consistency/MCMultiNodeReadsAlt.tla
5151

5252
- name: Upload TLC traces
53-
uses: actions/upload-artifact@v6
53+
uses: actions/upload-artifact@v7
5454
if: ${{ failure() }}
5555
with:
5656
name: tlc-model-checking-consistency
@@ -96,7 +96,7 @@ jobs:
9696
- run: ./tlc.py sim --num 500 --depth 50 consistency/MultiNodeReads.tla
9797

9898
- name: Upload TLC traces
99-
uses: actions/upload-artifact@v6
99+
uses: actions/upload-artifact@v7
100100
if: ${{ failure() }}
101101
with:
102102
name: tlc-simulation-consistency
@@ -135,7 +135,7 @@ jobs:
135135
- run: cd tla && ./tlc.py --trace-name 1C3N mc --term-count 0 --request-count 3 --raft-configs 1C3N consensus/MCccfraft.tla
136136

137137
- name: Upload TLC traces
138-
uses: actions/upload-artifact@v6
138+
uses: actions/upload-artifact@v7
139139
if: ${{ failure() }}
140140
with:
141141
name: tlc-model-checking-consensus
@@ -161,7 +161,7 @@ jobs:
161161
- run: ./tlc.py sim consensus/SIMccfraft.tla
162162

163163
- name: Upload TLC traces
164-
uses: actions/upload-artifact@v6
164+
uses: actions/upload-artifact@v7
165165
if: ${{ failure() }}
166166
with:
167167
name: tlc-simulation-consensus
@@ -233,7 +233,7 @@ jobs:
233233
shell: bash
234234

235235
- name: Upload artifacts.
236-
uses: actions/upload-artifact@v6
236+
uses: actions/upload-artifact@v7
237237
if: always()
238238
with:
239239
name: tlc-trace-validation-consensus

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
./tests.sh --timeout 360 --output-on-failure -L partitions -C partitions
9595
9696
- name: "Upload logs for virtual A"
97-
uses: actions/upload-artifact@v6
97+
uses: actions/upload-artifact@v7
9898
with:
9999
name: logs-azurelinux-virtual-a
100100
path: |
@@ -169,7 +169,7 @@ jobs:
169169
shell: bash
170170

171171
- name: "Upload logs for virtual B"
172-
uses: actions/upload-artifact@v6
172+
uses: actions/upload-artifact@v7
173173
with:
174174
name: logs-azurelinux-virtual-b
175175
path: |
@@ -249,7 +249,7 @@ jobs:
249249
if: success() || failure()
250250

251251
- name: "Upload logs"
252-
uses: actions/upload-artifact@v6
252+
uses: actions/upload-artifact@v7
253253
with:
254254
name: logs-aci-snp-milan
255255
path: |
@@ -330,7 +330,7 @@ jobs:
330330
if: success() || failure()
331331

332332
- name: "Upload logs"
333-
uses: actions/upload-artifact@v6
333+
uses: actions/upload-artifact@v7
334334
with:
335335
name: logs-caci-snp-genoa
336336
path: |

‎.github/workflows/long-test.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
6868
- name: "Upload logs"
6969
if: success() || failure()
70-
uses: actions/upload-artifact@v6
70+
uses: actions/upload-artifact@v7
7171
with:
7272
name: logs-asan
7373
path: |
@@ -127,7 +127,7 @@ jobs:
127127
128128
- name: "Upload logs"
129129
if: success() || failure()
130-
uses: actions/upload-artifact@v6
130+
uses: actions/upload-artifact@v7
131131
with:
132132
name: logs-tsan
133133
path: |
@@ -192,7 +192,7 @@ jobs:
192192
193193
- name: "Upload logs"
194194
if: success() || failure()
195-
uses: actions/upload-artifact@v6
195+
uses: actions/upload-artifact@v7
196196
with:
197197
name: logs-e2e-debug
198198
path: |
@@ -252,7 +252,7 @@ jobs:
252252
253253
- name: "Upload logs"
254254
if: success() || failure()
255-
uses: actions/upload-artifact@v6
255+
uses: actions/upload-artifact@v7
256256
with:
257257
name: logs-e2e-release
258258
path: |
@@ -338,7 +338,7 @@ jobs:
338338
339339
- name: "Upload logs"
340340
if: success() || failure()
341-
uses: actions/upload-artifact@v6
341+
uses: actions/upload-artifact@v7
342342
with:
343343
name: e2e-long-combined
344344
path: |

‎.github/workflows/long-verification.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
- run: cd tla && ./tlc.py --trace-name 2C2N mc --term-count 2 --request-count 0 --raft-configs 2C2N --disable-check-quorum consensus/MCccfraft.tla
4949

5050
- name: Upload TLC traces
51-
uses: actions/upload-artifact@v6
51+
uses: actions/upload-artifact@v7
5252
if: ${{ failure() }}
5353
with:
5454
name: tlc-model-checking-with-atomic-reconfig-consensus
@@ -86,7 +86,7 @@ jobs:
8686
- run: cd tla && ./tlc.py --trace-name 3C2N mc --term-count 2 --request-count 0 --raft-configs 3C2N --disable-check-quorum consensus/MCccfraft.tla
8787

8888
- name: Upload TLC traces
89-
uses: actions/upload-artifact@v6
89+
uses: actions/upload-artifact@v7
9090
if: ${{ failure() }}
9191
with:
9292
name: tlc-model-checking-with-reconfig-consensus
@@ -112,7 +112,7 @@ jobs:
112112
- run: ./tlc.py sim --max-seconds 3000 --depth 500 consensus/SIMccfraft.tla
113113

114114
- name: Upload TLC traces
115-
uses: actions/upload-artifact@v6
115+
uses: actions/upload-artifact@v7
116116
if: ${{ failure() }}
117117
with:
118118
name: tlc-simulation-consensus

‎.github/workflows/release-attestation.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141

4242
- name: Attest release assets
4343
id: attest
44-
uses: actions/attest-build-provenance@v3
44+
uses: actions/attest-build-provenance@v4
4545
with:
4646
subject-path: "release-assets/*"
4747

‎.github/workflows/release.yml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
./sbom-tool generate -b . -bc . -pn CCF -ps Microsoft -nsb https://sbom.microsoft -pv $CCF_VERSION -V Error
3434
shell: bash
3535
- name: "Upload SBOM"
36-
uses: actions/upload-artifact@v6
36+
uses: actions/upload-artifact@v7
3737
with:
3838
name: sbom
3939
path: _manifest/spdx_2.2/*
@@ -56,7 +56,7 @@ jobs:
5656
set -o pipefail
5757
./scripts/extract-release-notes.py --target-git-version --describe-path-changes "./samples/constitution" | tee rel-notes.md
5858
- name: "Upload Release Notes"
59-
uses: actions/upload-artifact@v6
59+
uses: actions/upload-artifact@v7
6060
with:
6161
name: relnotes
6262
path: rel-notes.md
@@ -156,7 +156,7 @@ jobs:
156156

157157
- name: "Upload logs"
158158
if: success() || failure()
159-
uses: actions/upload-artifact@v6
159+
uses: actions/upload-artifact@v7
160160
with:
161161
name: logs
162162
path: |
@@ -218,19 +218,19 @@ jobs:
218218
shell: bash
219219

220220
- name: "Upload .rpm Package"
221-
uses: actions/upload-artifact@v6
221+
uses: actions/upload-artifact@v7
222222
with:
223223
name: pkg
224224
path: build/${{ steps.make_rpm_devel.outputs.name }}
225225

226226
- name: "Upload Compatibility Report"
227-
uses: actions/upload-artifact@v6
227+
uses: actions/upload-artifact@v7
228228
with:
229229
name: compatibility
230230
path: build/compatibility_report.json
231231

232232
- name: "Upload TLS Report"
233-
uses: actions/upload-artifact@v6
233+
uses: actions/upload-artifact@v7
234234
with:
235235
name: tls
236236
path: build/tls_report.html
@@ -249,7 +249,7 @@ jobs:
249249
shell: bash
250250

251251
- name: "Upload Python Wheel"
252-
uses: actions/upload-artifact@v6
252+
uses: actions/upload-artifact@v7
253253
with:
254254
name: wheel
255255
path: python/${{ steps.build_wheel.outputs.name }}
@@ -269,7 +269,7 @@ jobs:
269269
shell: bash
270270

271271
- name: "Upload TS Package"
272-
uses: actions/upload-artifact@v6
272+
uses: actions/upload-artifact@v7
273273
with:
274274
name: tstgz
275275
path: js/ccf-app/${{ steps.build_tstgz.outputs.name }}
@@ -293,7 +293,7 @@ jobs:
293293
cat $filename
294294
295295
- name: "Upload Reproducibility Metadata"
296-
uses: actions/upload-artifact@v6
296+
uses: actions/upload-artifact@v7
297297
with:
298298
name: reproduce-metadata
299299
path: reproduce.json
@@ -325,7 +325,7 @@ jobs:
325325
fetch-depth: 0
326326

327327
- name: Download RPM
328-
uses: actions/download-artifact@v7
328+
uses: actions/download-artifact@v8
329329
with:
330330
path: DOWNLOAD_DIR
331331
pattern: pkg
@@ -374,13 +374,13 @@ jobs:
374374
with:
375375
fetch-depth: 0
376376
- name: Download Prebuilt Packages
377-
uses: actions/download-artifact@v7
377+
uses: actions/download-artifact@v8
378378
with:
379379
path: DOWNLOAD_DIR
380380
pattern: pkg
381381
merge-multiple: true
382382
- name: Download Reproducibility Metadata
383-
uses: actions/download-artifact@v7
383+
uses: actions/download-artifact@v8
384384
with:
385385
path: repro
386386
pattern: reproduce-metadata
@@ -411,7 +411,7 @@ jobs:
411411
cmp "$PKG" "DOWNLOAD_DIR/$(basename "$PKG")"
412412
- name: Upload Non-Reproduced Package
413413
if: failure()
414-
uses: actions/upload-artifact@v6
414+
uses: actions/upload-artifact@v7
415415
with:
416416
name: not-reproduced
417417
path: ${{ env.REPRO_DIR }}
@@ -431,40 +431,40 @@ jobs:
431431
with:
432432
fetch-depth: 1
433433
- name: Download Packages
434-
uses: actions/download-artifact@v7
434+
uses: actions/download-artifact@v8
435435
with:
436436
path: pkg
437437
pattern: pkg*
438438
merge-multiple: true
439439
- name: Download Release Notes
440-
uses: actions/download-artifact@v7
440+
uses: actions/download-artifact@v8
441441
with:
442442
name: relnotes
443443
- name: Download Compatibility Report
444-
uses: actions/download-artifact@v7
444+
uses: actions/download-artifact@v8
445445
with:
446446
name: compatibility
447447
- name: Download TLS Report
448-
uses: actions/download-artifact@v7
448+
uses: actions/download-artifact@v8
449449
with:
450450
name: tls
451451
- name: Download Python Wheel
452-
uses: actions/download-artifact@v7
452+
uses: actions/download-artifact@v8
453453
with:
454454
path: wheel
455455
name: wheel
456456
- name: Download TS Package
457-
uses: actions/download-artifact@v7
457+
uses: actions/download-artifact@v8
458458
with:
459459
path: tstgz
460460
name: tstgz
461461
- name: Download SBOM
462-
uses: actions/download-artifact@v7
462+
uses: actions/download-artifact@v8
463463
with:
464464
path: sbom
465465
name: sbom
466466
- name: Download Reproducibility Metadata
467-
uses: actions/download-artifact@v7
467+
uses: actions/download-artifact@v8
468468
with:
469469
path: repro
470470
pattern: reproduce*

‎CHANGELOG.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,22 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
66
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
77

8+
## [7.0.0-dev12]
9+
10+
[7.0.0-dev12]: https://github.com/microsoft/CCF/releases/tag/ccf-7.0.0-dev12
11+
12+
### Added
13+
14+
- Added `ccf::describe_cose_receipt_v1(receipt)` to obtain COSE receipts with Merkle proof in unprotected header for non-signature TXs, and empty unprotected header for signature TXs (#7700).
15+
- `NetworkIdentitySubsystemInterface` now exposes `get_trusted_keys()`, returning all trusted network identity keys as a `TrustedKeys` map (#7690).
16+
17+
### Changed
18+
19+
- Refactored the user facing surface of self-healing-open and local sealing. The whole feature is now `sealing-recovery` with `self-healing-open` now referred to as the `recovery-decision-protocol`. (#7679)
20+
- Local sealing is enabled by setting the `sealing-recovery` config field (for both the sealing node, and the unsealing recovery node)
21+
- The local sealing identity is under `sealing-recovery.location.name`
22+
- The recovery-decision-protocol is configured via `sealing-recovery.recovery_decision_protocol`
23+
824
## [7.0.0-dev11]
925

1026
[7.0.0-dev11]: https://github.com/microsoft/CCF/releases/tag/ccf-7.0.0-dev11

0 commit comments

Comments
 (0)