Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

⬆️ ✨ Upgrade ACA-Py and resolve noisy error logs #1162

Merged
merged 56 commits into from
Dec 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
10c7d5c
:construction: test acapy changes
ff137 Nov 5, 2024
c91c311
:construction: update plugin commit hashes
ff137 Nov 5, 2024
921dfa8
Merge branch 'development' into test-acapy-changes
ff137 Nov 5, 2024
bb2cf4d
:construction: update plugin commit hashes
ff137 Nov 5, 2024
c855d7f
:construction: debug IndyVdrLedger close issue
ff137 Nov 5, 2024
5006de5
:construction: test no banner on startup
ff137 Nov 5, 2024
2960885
Merge branch 'development' into test-acapy-changes
ff137 Nov 5, 2024
d541b1d
:construction: test skipping k6 tests
ff137 Nov 5, 2024
e5014bc
:construction: test correction
ff137 Nov 5, 2024
e46b458
:construction: test indy-vdr-ledger-pool singleton behaviour
ff137 Nov 6, 2024
409872d
Merge branch 'development' into test-acapy-changes
ff137 Nov 6, 2024
dc1149d
:construction: test indy-vdr-ledger-pool singleton behaviour
ff137 Nov 6, 2024
4c01fb5
:construction_worker: Filter PR Validator Comments (#1167)
rblaine95 Nov 6, 2024
c894b6e
:arrow_up: Update Local Tilt Resources (#1168)
rblaine95 Nov 6, 2024
0037a77
:construction: test logging improvements
ff137 Nov 7, 2024
17d48fc
Merge branch 'development' into test-acapy-changes
ff137 Nov 7, 2024
b3e8186
:construction:
ff137 Nov 7, 2024
9c9e812
:construction: test rebased branch
ff137 Nov 7, 2024
7624f92
Merge branch 'development' into test-acapy-changes
ff137 Nov 11, 2024
1dd1d8e
:construction: update plugin commit hashes
ff137 Nov 11, 2024
86cbf11
:construction: test-1.1.1a4
ff137 Nov 13, 2024
073c148
Merge branch 'master' into test-acapy-changes
ff137 Nov 13, 2024
f8aabcc
Merge branch 'master' into test-acapy-changes
ff137 Nov 26, 2024
3f67771
:construction: Test 1.1.1a5
ff137 Nov 26, 2024
f4b95a5
:construction:
ff137 Nov 26, 2024
77c3fe1
:construction:
ff137 Nov 26, 2024
8ef8b77
:construction:
ff137 Nov 26, 2024
de08799
:construction: Test with latest upstream and logging changes
ff137 Nov 27, 2024
5064936
:construction:
ff137 Nov 27, 2024
026c740
:construction: Test DeferLoad caching
ff137 Nov 28, 2024
46dfbb9
:construction: Test ClassLoader caching
ff137 Nov 28, 2024
7978e5b
:construction: Test with less logging
ff137 Nov 28, 2024
0b1c08b
:construction: test-1.1.1b5
ff137 Dec 2, 2024
ccc961c
Merge branch 'master' into test-acapy-changes
ff137 Dec 2, 2024
0cf8816
:construction:
ff137 Dec 2, 2024
4a28897
Merge branch 'master' into test-acapy-changes
ff137 Dec 4, 2024
c4405ee
:construction: test latest main sync
ff137 Dec 4, 2024
6a921b4
:construction: test latest log improvements
ff137 Dec 5, 2024
4f677ff
:art: Ensure alice did is qualified in rotate request
ff137 Dec 5, 2024
c8d73e0
Merge branch 'master' into test-acapy-changes
ff137 Dec 5, 2024
0597479
:art: Update example
ff137 Dec 5, 2024
d77b41b
:wrench: Configure asyncio_default_fixture_loop_scope
ff137 Dec 5, 2024
bea77bb
:white_check_mark: Fix test
ff137 Dec 5, 2024
4d4e5b5
⬆️ Mise `2024.12.0` (#1218)
rblaine95 Dec 5, 2024
1fc5efb
:construction:
ff137 Dec 5, 2024
4c2c82a
Merge branch 'master' into test-acapy-changes
ff137 Dec 5, 2024
241308c
:construction:
ff137 Dec 5, 2024
7fbe158
:construction: Possibly final test ...
ff137 Dec 5, 2024
74ac2c9
:sparkles: Update base image tag
ff137 Dec 5, 2024
512b1f7
:construction: Update plugin commit hashes
ff137 Dec 5, 2024
529d1bd
:construction: Test new cloudcontroller
ff137 Dec 5, 2024
09a1b7f
:arrow_up: Update lock files
ff137 Dec 5, 2024
be182b0
Merge branch 'master' into test-acapy-changes
ff137 Dec 5, 2024
36e1040
:arrow_up: Use new cloudcontroller release
ff137 Dec 5, 2024
353a817
:arrow_up: Update plugins to latest releases
ff137 Dec 5, 2024
e1c179d
:rewind: Revert change to skip k6
ff137 Dec 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/models/wallet.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class DIDCreate(DIDCreateAcaPy):
default=None,
deprecated=True,
description="(Deprecated) Define a key type and/or a DID depending on the chosen DID method.",
examples=[{"key_type": "ed25519", "did": "did:peer:2"}],
examples=[{"key_type": "ed25519", "did": "did:peer:2..."}],
)
seed: Optional[StrictStr] = Field(
default=None,
Expand Down
578 changes: 281 additions & 297 deletions app/poetry.lock

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion app/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package-mode = false
python = "^3.12"

aiohttp = "~3.11.7"
aries-cloudcontroller = "==1.1.1b3"
aries-cloudcontroller = "==1.2.0.post20241205"
base58 = "~2.1.1"
fastapi = "~0.115.0"
httpx = "~0.28.0"
Expand Down Expand Up @@ -51,3 +51,4 @@ profile = "black"
[tool.pytest.ini_options]
addopts = "--junitxml=junit.xml -p no:cacheprovider --cov-report=xml --cov-report=term"
junit_family = "xunit2"
asyncio_default_fixture_loop_scope = "function"
7 changes: 6 additions & 1 deletion app/tests/e2e/test_did_rotate.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from assertpy import assert_that
from fastapi import HTTPException

from app.models.wallet import DIDCreate
from app.routes.connections import router as connections_router
from app.services import acapy_wallet
from app.tests.util.webhooks import check_webhook_state
Expand All @@ -13,10 +14,12 @@


@pytest.mark.anyio
@pytest.mark.parametrize("did_method", ["did:peer:2", "did:peer:4"])
async def test_rotate_did(
alice_member_client: RichAsyncClient,
alice_acapy_client: AcaPyClient,
faber_acapy_client: AcaPyClient,
did_method: str,
):
# First, create did-exchange connections between Alice and Faber:
faber_public_did = await acapy_wallet.get_public_did(controller=faber_acapy_client)
Expand All @@ -36,7 +39,9 @@ async def test_rotate_did(
)

# Create a new did for Alice and rotate
new_did = await acapy_wallet.create_did(controller=alice_acapy_client)
new_did = await acapy_wallet.create_did(
controller=alice_acapy_client, did_create=DIDCreate(method=did_method)
)
alice_new_did = new_did.did

rotate_response = await alice_member_client.post(
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/agents/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/didx-xyz/acapy-agent-bbs:py3.12-1.1.1-20241115
FROM ghcr.io/didx-xyz/acapy-agent-bbs:py3.12-1.2.0-20241205

COPY configuration ./configuration
COPY scripts ./scripts
4 changes: 2 additions & 2 deletions dockerfiles/agents/Dockerfile.agent
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/didx-xyz/acapy-agent-bbs:py3.12-1.1.1-20241115
FROM ghcr.io/didx-xyz/acapy-agent-bbs:py3.12-1.2.0-20241205

USER root

Expand All @@ -7,7 +7,7 @@ ARG PROTOBUF_VERSION=5.29.0
RUN pip install --no-cache-dir protobuf==${PROTOBUF_VERSION}

# install nats-events plugin
RUN pip install --no-cache-dir git+https://github.com/didx-xyz/aries-acapy-plugins@1.1.1-20241115#subdirectory=nats_events
RUN pip install --no-cache-dir git+https://github.com/didx-xyz/aries-acapy-plugins@1.2.0-20241205#subdirectory=nats_events

COPY scripts/startup.sh startup.sh
RUN chmod +x ./startup.sh
Expand Down
6 changes: 3 additions & 3 deletions dockerfiles/agents/Dockerfile.author.agent
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/didx-xyz/acapy-agent-bbs:py3.12-1.1.1-20241115
FROM ghcr.io/didx-xyz/acapy-agent-bbs:py3.12-1.2.0-20241205

USER root

Expand All @@ -7,10 +7,10 @@ ARG PROTOBUF_VERSION=5.29.0
RUN pip install --no-cache-dir protobuf==${PROTOBUF_VERSION}

# Install wallet group id plugin
RUN pip install --no-cache-dir acapy-wallet-groups-plugin==1.1.1.post20241115
RUN pip install --no-cache-dir acapy-wallet-groups-plugin==1.2.0.post20241205

# install nats-events plugin
RUN pip install --no-cache-dir git+https://github.com/didx-xyz/aries-acapy-plugins@1.1.1-20241115#subdirectory=nats_events
RUN pip install --no-cache-dir git+https://github.com/didx-xyz/aries-acapy-plugins@1.2.0-20241205#subdirectory=nats_events

COPY scripts/startup.sh startup.sh
RUN chmod +x ./startup.sh
Expand Down
570 changes: 277 additions & 293 deletions endorser/poetry.lock

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion endorser/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ package-mode = false
[tool.poetry.dependencies]
python = "^3.12"

aries-cloudcontroller = "==1.1.1b3"
aries-cloudcontroller = "==1.2.0.post20241205"
dependency-injector-fork = "~=4.42.1" # https://github.com/ets-labs/python-dependency-injector/pull/765#issuecomment-1915100744
fastapi = "~0.115.0"
httpx = "~0.28.0"
Expand Down Expand Up @@ -43,3 +43,4 @@ profile = "black"
[tool.pytest.ini_options]
addopts = "--junitxml=junit.xml -p no:cacheprovider --cov-report=xml --cov-report=term"
junit_family = "xunit2"
asyncio_default_fixture_loop_scope = "function"
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ profile = "black"
[tool.pytest.ini_options]
addopts = "--junitxml=junit.xml -p no:cacheprovider --cov-report=xml --cov-report=term"
junit_family = "xunit2"
asyncio_default_fixture_loop_scope = "function"
56 changes: 28 additions & 28 deletions trustregistry/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions trustregistry/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,4 @@ profile = "black"
[tool.pytest.ini_options]
addopts = "--junitxml=junit.xml -p no:cacheprovider --cov-report=xml --cov-report=term"
junit_family = "xunit2"
asyncio_default_fixture_loop_scope = "function"
Loading
Loading