Skip to content

Commit 33cdc75

Browse files
authored
Merge branch 'main' into fix/cip36-assets-indexing
2 parents fbf5f34 + 01d02ad commit 33cdc75

File tree

157 files changed

+5710
-1327
lines changed

Some content is hidden

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

157 files changed

+5710
-1327
lines changed

.config/dictionaries/project.dic

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,10 +179,10 @@ libatspi
179179
libavcodec
180180
libcatalyst
181181
libdrm
182-
libsqlite3
183182
libflutter
184183
libgbm
185184
libnss
185+
libsqlite3
186186
libxkbcommon
187187
libxshmfence
188188
Lifetimeable
@@ -260,13 +260,13 @@ pytest
260260
qrcode
261261
rapidoc
262262
ratelimit
263-
RGBO
264263
redoc
265264
reloadable
266265
Replayability
267266
repr
268267
reqwest
269268
rfwtxt
269+
RGBO
270270
rgloader
271271
ripgrep
272272
ristretto
@@ -382,4 +382,4 @@ xprv
382382
xpub
383383
xpublic
384384
xvfb
385-
yoroi
385+
yoroi

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ permissions:
1717

1818
jobs:
1919
ci:
20-
uses: input-output-hk/catalyst-forge/.github/workflows/ci.yml@ci/v1.7.1
20+
uses: input-output-hk/catalyst-forge/.github/workflows/ci.yml@ci/v1.7.2
2121
with:
2222
forge_version: 0.14.0
2323

.github/workflows/flutter-uikit-example-firebase-deploy.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ jobs:
2020
steps:
2121
- uses: actions/checkout@v4
2222
- name: Install Forge
23-
uses: input-output-hk/catalyst-forge/actions/install@ci/v1.7.1
23+
uses: input-output-hk/catalyst-forge/actions/install@ci/v1.7.2
2424
with:
2525
version: 0.14.0
2626
- name: Setup CI
27-
uses: input-output-hk/catalyst-forge/actions/setup@ci/v1.7.1
27+
uses: input-output-hk/catalyst-forge/actions/setup@ci/v1.7.2
2828
- name: Build Flutter Web
29-
uses: input-output-hk/catalyst-forge/actions/run@ci/v1.7.1
29+
uses: input-output-hk/catalyst-forge/actions/run@ci/v1.7.2
3030
if: always()
3131
continue-on-error: true
3232
with:

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,40 +26,40 @@ jobs:
2626
- uses: actions/checkout@v4
2727

2828
- name: Install Forge
29-
uses: input-output-hk/catalyst-forge/actions/install@ci/v1.7.1
29+
uses: input-output-hk/catalyst-forge/actions/install@ci/v1.7.2
3030
with:
3131
version: 0.14.0
3232
if: always()
3333

3434
- name: Setup CI
35-
uses: input-output-hk/catalyst-forge/actions/setup@ci/v1.7.1
35+
uses: input-output-hk/catalyst-forge/actions/setup@ci/v1.7.2
3636

3737
- name: Get catalyst gateway unit test report
38-
uses: input-output-hk/catalyst-forge/actions/run@ci/v1.7.1
38+
uses: input-output-hk/catalyst-forge/actions/run@ci/v1.7.2
3939
if: always()
4040
continue-on-error: true
4141
with:
4242
command: run
4343
args: ./catalyst-gateway+build
4444

4545
- name: Get schemathesis test report
46-
uses: input-output-hk/catalyst-forge/actions/run@ci/v1.7.1
46+
uses: input-output-hk/catalyst-forge/actions/run@ci/v1.7.2
4747
if: always()
4848
continue-on-error: true
4949
with:
5050
command: run
5151
args: ./catalyst-gateway/tests/schemathesis_tests+test-ci-schemathesis
5252

5353
- name: Get flutter unit test report
54-
uses: input-output-hk/catalyst-forge/actions/run@ci/v1.7.1
54+
uses: input-output-hk/catalyst-forge/actions/run@ci/v1.7.2
5555
if: always()
5656
continue-on-error: true
5757
with:
5858
command: run
5959
args: ./catalyst_voices+test-unit-native
6060

6161
- name: Get python api test report
62-
uses: input-output-hk/catalyst-forge/actions/run@ci/v1.7.1
62+
uses: input-output-hk/catalyst-forge/actions/run@ci/v1.7.2
6363
if: always()
6464
continue-on-error: true
6565
with:

.github/workflows/nightly-ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ env:
2020

2121
jobs:
2222
ci_nightly:
23-
uses: input-output-hk/catalyst-forge/.github/workflows/ci.yml@ci/v1.7.1
23+
uses: input-output-hk/catalyst-forge/.github/workflows/ci.yml@ci/v1.7.2
2424
with:
2525
forge_version: 0.14.0
2626
nightly: true
@@ -34,31 +34,31 @@ jobs:
3434
- uses: actions/checkout@v4
3535

3636
- name: Install Forge
37-
uses: input-output-hk/catalyst-forge/actions/install@ci/v1.7.1
37+
uses: input-output-hk/catalyst-forge/actions/install@ci/v1.7.2
3838
with:
3939
version: 0.10.0
4040

4141
- name: Setup CI
42-
uses: input-output-hk/catalyst-forge/actions/setup@ci/v1.7.1
42+
uses: input-output-hk/catalyst-forge/actions/setup@ci/v1.7.2
4343

4444
- name: Get python api test report
45-
uses: input-output-hk/catalyst-forge/actions/run@ci/v1.7.1
45+
uses: input-output-hk/catalyst-forge/actions/run@ci/v1.7.2
4646
if: always()
4747
continue-on-error: true
4848
with:
4949
command: run
5050
args: ./catalyst-gateway/tests/api_tests+nightly-test
5151

5252
- name: Get cardano wallet integration test report
53-
uses: input-output-hk/catalyst-forge/actions/run@ci/v1.7.1
53+
uses: input-output-hk/catalyst-forge/actions/run@ci/v1.7.2
5454
if: always()
5555
continue-on-error: true
5656
with:
5757
command: run
5858
args: ./catalyst_voices/packages/libs/catalyst_cardano/catalyst_cardano/wallet-automation+nightly-test
5959

6060
- name: Get schemathesis nightly dev test report
61-
uses: input-output-hk/catalyst-forge/actions/run@ci/v1.7.1
61+
uses: input-output-hk/catalyst-forge/actions/run@ci/v1.7.2
6262
if: always()
6363
continue-on-error: true
6464
with:

catalyst-gateway/bin/Cargo.toml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ repository.workspace = true
1515
workspace = true
1616

1717
[dependencies]
18-
cardano-chain-follower = { version = "0.0.8", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250331-01" }
19-
rbac-registration = { version = "0.0.4", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250331-01" }
20-
catalyst-types = { version = "0.0.3", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250331-01" }
21-
cardano-blockchain-types = { version = "0.0.3", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250331-01" }
22-
catalyst-signed-doc = { version = "0.0.4", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250331-01" }
18+
cardano-chain-follower = { version = "0.0.8", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250401-01" }
19+
rbac-registration = { version = "0.0.4", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250401-01" }
20+
catalyst-types = { version = "0.0.3", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250401-01" }
21+
cardano-blockchain-types = { version = "0.0.3", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250401-01" }
22+
catalyst-signed-doc = { version = "0.0.4", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250401-01" }
2323

2424
pallas = { version = "0.30.1", git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "9b5183c8b90b90fe2cc319d986e933e9518957b3" }
2525
pallas-traverse = { version = "0.30.1", git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "9b5183c8b90b90fe2cc319d986e933e9518957b3" }
@@ -104,6 +104,9 @@ poem-openapi-derive = { version = "=5.1.4" }
104104
# Its a transitive dependency of the "poem-openapi-derive" crate,
105105
# but its breaks API after version "0.20.11".
106106
darling = { version = "=0.20.10" }
107+
# Its a transitive dependency of the "orx-concurrent-vec" crate,
108+
# but its breaks API after version "1.3.0".
109+
orx-iterable = { version = "=1.2.0" }
107110

108111
[dev-dependencies]
109112

@@ -112,4 +115,4 @@ build-info-build = "0.0.39"
112115

113116
[package.metadata.cargo-machete]
114117
# remove that after fixing issues with latest crates
115-
ignored = ["poem-openapi-derive", "darling"]
118+
ignored = ["poem-openapi-derive", "darling", "orx-iterable"]

catalyst-gateway/tests/api_tests/integration/test_signed_doc.py

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,39 @@ def __comment_doc_factory() -> SignedDocument:
125125
return __comment_doc_factory
126126

127127

128+
# return a submission action document.
129+
@pytest.fixture
130+
def submission_action_factory(
131+
proposal_doc_factory, comment_templates
132+
) -> SignedDocument:
133+
def __submission_action_factory() -> SignedDocument:
134+
proposal_doc = proposal_doc_factory()
135+
submission_action_id = uuid7str()
136+
sub_action_metadata_json = {
137+
"id": submission_action_id,
138+
"ver": submission_action_id,
139+
# submission action type
140+
"type": "5e60e623-ad02-4a1b-a1ac-406db978ee48",
141+
"content-type": "application/json",
142+
"content-encoding": "br",
143+
"ref": {"id": proposal_doc.metadata["id"]},
144+
}
145+
with open(
146+
"./test_data/signed_docs/submission_action.json", "r"
147+
) as comment_json_file:
148+
comment_json = json.load(comment_json_file)
149+
150+
doc = SignedDocument(sub_action_metadata_json, comment_json)
151+
resp = document.put(data=doc.hex())
152+
assert (
153+
resp.status_code == 201
154+
), f"Failed to publish sub_action: {resp.status_code} - {resp.text}"
155+
156+
return doc
157+
158+
return __submission_action_factory
159+
160+
128161
def test_templates(proposal_templates, comment_templates):
129162
templates = proposal_templates + comment_templates
130163
for template_id in templates:
@@ -235,6 +268,47 @@ def test_comment_doc(comment_doc_factory):
235268
logger.info("Comment document test successful.")
236269

237270

271+
def test_submission_action(submission_action_factory):
272+
submission_action = submission_action_factory()
273+
submission_action_id = submission_action.metadata["id"]
274+
275+
# Put a submission action document
276+
resp = document.put(data=submission_action.hex())
277+
assert (
278+
resp.status_code == 204
279+
), f"Failed to publish document: {resp.status_code} - {resp.text}"
280+
281+
# Get the submission action doc
282+
resp = document.get(document_id=submission_action_id)
283+
assert (
284+
resp.status_code == 200
285+
), f"Failed to get document: {resp.status_code} - {resp.text}"
286+
287+
# Post a signed document with filter ID
288+
resp = document.post("/index", filter={"id": {"eq": submission_action_id}})
289+
assert (
290+
resp.status_code == 200
291+
), f"Failed to post document: {resp.status_code} - {resp.text}"
292+
293+
# Submission action document MUST have a ref
294+
invalid_doc = submission_action.copy()
295+
invalid_doc.metadata["ref"] = {}
296+
resp = document.put(data=invalid_doc.hex())
297+
assert (
298+
resp.status_code == 422
299+
), f"Publish document, expected 422 Unprocessable Content: {resp.status_code} - {resp.text}"
300+
301+
# Put a submission action document referencing an unknown proposal
302+
invalid_doc = submission_action.copy()
303+
invalid_doc.metadata["ref"] = {"id": uuid7str()}
304+
resp = document.put(data=invalid_doc.hex())
305+
assert (
306+
resp.status_code == 422
307+
), f"Publish document, expected 422 Unprocessable Content: {resp.status_code} - {resp.text}"
308+
309+
logger.info("Submission action document test successful.")
310+
311+
238312
def test_document_index_endpoint(proposal_doc_factory):
239313
# submiting 10 proposal documents
240314
total_amount = 10

0 commit comments

Comments
 (0)