Skip to content

Commit a99a7e7

Browse files
bkioshnbkioshn
committed
Merge branch 'main' into fix/refactor-chain-follower
Signed-off-by: bkioshn <[email protected]>
2 parents 1d095c5 + 768ecd5 commit a99a7e7

File tree

107 files changed

+5155
-195
lines changed

Some content is hidden

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

107 files changed

+5155
-195
lines changed

‎.config/dictionaries/project.dic‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Arissara
1010
asyncio
1111
Attributes
1212
auditability
13+
auxdata
1314
babystep
1415
backpressure
1516
bech
@@ -42,6 +43,7 @@ ciphertexts
4243
Coap
4344
codegen
4445
codepoints
46+
collabs
4547
coti
4648
coverallsapp
4749
cpus
@@ -56,6 +58,7 @@ dbsync
5658
dcbor
5759
decompressor
5860
delegators
61+
displaydoc
5962
dleq
6063
dlog
6164
dockerhub
@@ -252,6 +255,7 @@ Traceback
252255
txmonitor
253256
txns
254257
typenum
258+
uncategorized
255259
unfinalized
256260
unixfs
257261
unlinkat

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ permissions:
1313

1414
jobs:
1515
ci:
16-
uses: input-output-hk/catalyst-forge/.github/workflows/ci.yml@ci/v1.1.0
16+
uses: input-output-hk/catalyst-forge/.github/workflows/ci.yml@ci/v1.5.0
1717
with:
18-
forge_version: 0.2.0
18+
forge_version: 0.8.0
1919

2020
test_reporting:
2121
if: always()

‎.github/workflows/generate-allure-report.yml‎

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ concurrency:
1313
cancel-in-progress: true
1414

1515
env:
16-
AWS_REGION: eu-central-1
17-
AWS_ROLE_ARN: arn:aws:iam::332405224602:role/ci
18-
EARTHLY_TARGET: docker
19-
ECR_REGISTRY: 332405224602.dkr.ecr.eu-central-1.amazonaws.com
2016
ALLURE_REPORT_PATH: allure-report
2117
COVERAGE_REPORT_PATH: coverage-report
2218
REPORT_EXT: .junit-report.xml
@@ -29,24 +25,22 @@ jobs:
2925
steps:
3026
- uses: actions/checkout@v4
3127

32-
- name: Setup CI
33-
uses: input-output-hk/catalyst-ci/actions/setup@master
28+
- name: Install Forge
29+
uses: input-output-hk/catalyst-forge/actions/install@ci/v1.5.0
3430
with:
35-
aws_role_arn: ${{ env.AWS_ROLE_ARN }}
36-
aws_region: ${{ env.AWS_REGION }}
37-
earthly_runner_secret: ${{ secrets.EARTHLY_RUNNER_SECRET }}
31+
version: 0.8.0
32+
if: always()
33+
34+
- name: Setup CI
35+
uses: input-output-hk/catalyst-forge/actions/setup@ci/v1.5.0
3836

3937
- name: Get catalyst libs unit test report
40-
uses: input-output-hk/catalyst-ci/actions/run@master
38+
uses: input-output-hk/catalyst-forge/actions/run@ci/v1.5.0
4139
if: always()
4240
continue-on-error: true
4341
with:
44-
earthfile: ./rust/
45-
flags:
46-
targets: build
47-
target_flags:
48-
runner_address: ${{ secrets.EARTHLY_SATELLITE_ADDRESS }}
49-
artifact: "false"
42+
command: run
43+
args: ./rust+build
5044

5145
- name: Collect and upload test reports
5246
uses: actions/upload-artifact@v4
@@ -107,11 +101,10 @@ jobs:
107101

108102
- name: Comment PR with Allure report link
109103
if: ${{ always() && github.event_name == 'pull_request' && steps.allure.outputs.report_url }}
110-
uses: thollander/actions-comment-pull-request@v2
104+
uses: thollander/actions-comment-pull-request@v3
111105
with:
112106
message: |
113107
${{ steps.allure.outputs.test_result_icon }} [Test Report](${{ steps.allure.outputs.report_url }}) | ${\color{lightgreen}Pass: ${{ steps.allure.outputs.test_result_passed }}/${{ steps.allure.outputs.test_result_total }}}$ | ${\color{red}Fail: ${{ steps.allure.outputs.test_result_failed }}/${{ steps.allure.outputs.test_result_total }}}$ |
114-
comment_tag: allure_report
115108
mode: upsert
116109

117110
generate-coverage-report:

‎.github/workflows/semantic_pull_request.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ jobs:
1818
rust
1919
rust/c509-certificate
2020
rust/cardano-chain-follower
21+
rust/catalyst-types
2122
rust/catalyst-voting
2223
rust/immutable-ledger
2324
rust/vote-tx-v1
@@ -26,6 +27,7 @@ jobs:
2627
rust/cbork
2728
rust/hermes-ipfs
2829
rust/rbac-registration
30+
rust/cardano-blockchain-types
2931
dart
3032
docs
3133
general

‎Earthfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
VERSION 0.8
22

3-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:v3.2.23 AS mdlint-ci
4-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:v3.2.23 AS cspell-ci
3+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:v3.2.27 AS mdlint-ci
4+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:v3.2.27 AS cspell-ci
55

66

77
FROM debian:stable-slim

‎blueprint.cue‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,14 @@ global: {
66
"^build(-.*)?$",
77
"^package(-.*)?$",
88
"^test(-.*)?$",
9-
"^release(-.*)?$",
10-
"^publish(-.*)?$",
119
]
1210
registries: [
13-
ci.providers.aws.registry,
11+
ci.providers.aws.ecr.registry,
1412
]
1513
providers: {
1614
aws: {
1715
region: "eu-central-1"
18-
registry: "332405224602.dkr.ecr.eu-central-1.amazonaws.com"
16+
ecr: registry: "332405224602.dkr.ecr.eu-central-1.amazonaws.com"
1917
role: "arn:aws:iam::332405224602:role/ci"
2018
}
2119

@@ -44,8 +42,9 @@ global: {
4442
path: "GITHUB_TOKEN"
4543
},
4644
]
47-
tagging: {
48-
strategy: "commit"
49-
}
45+
}
46+
repo: {
47+
defaultBranch: "main"
48+
name: "input-output-hk/catalyst-libs"
5049
}
5150
}

‎docs/Earthfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION 0.8
22

3-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/docs:v3.2.23 AS docs-ci
3+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/docs:v3.2.27 AS docs-ci
44

55

66
IMPORT .. AS repo

‎docs/src/architecture/08_concepts/catalyst_voting/cddl/Earthfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION 0.8
22

3-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cddl:v3.2.23 AS cddl-ci
3+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cddl:v3.2.27 AS cddl-ci
44

55
check-cddl:
66
FROM cddl-ci+cddl-base

‎docs/src/architecture/08_concepts/immutable_ledger/cddl/Earthfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION 0.8
22

3-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cddl:v3.2.23 AS cddl-ci
3+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cddl:v3.2.27 AS cddl-ci
44

55
check-cddl:
66
FROM cddl-ci+cddl-base

‎docs/src/architecture/08_concepts/immutable_ledger/cddl/block.cddl‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,19 @@ block = [
88
]
99

1010
block-header = [
11-
chain-id: ULID,
11+
chain-id: UUID, ; UUID v7
1212
height: int,
1313
timestamp: #6.1(uint .ge 1722470400), ; Epoch-based date/time
1414
prev-block-id: hash-bytes, ; hash of the previous block
15-
?ledger-type: UUID,
16-
?purpose-id: ULID / UUID,
15+
?ledger-type: UUID, ; UUID v4
16+
?purpose-id: UUID, ; UUID v7
1717
?validator,
1818
~metadata,
1919
]
2020

2121
block-data = encoded-cbor
2222

2323
UUID = #6.37(bytes) ; UUID type
24-
ULID = #6.32780(bytes) ; ULID type
2524

2625
kid = hash-bytes ; hash of the x509/c509 certificate
2726

0 commit comments

Comments
 (0)