fix: resolve the error related to profile context switching

Signed-off-by: Yuki I <omoge.real@gmail.com>

Author: MonolithicMonk

acapy_agent/anoncreds/default/legacy_indy/registry.py

@@ -74,13 +74,8 @@
     RevRegDefState,
     RevRegDefValue,
 )
-from ...models.schema import (
-    AnonCredsSchema,
-    GetSchemaResult,
-    SchemaResult,
-    SchemaState,
-)
-from ...models.schema_info import AnoncredsSchemaInfo
+from ...models.schema import AnonCredsSchema, GetSchemaResult, SchemaResult, SchemaState
+from ...models.schema_info import AnonCredsSchemaInfo
 from ...revocation import (
     CATEGORY_REV_LIST,
     CATEGORY_REV_REG_DEF,
@@ -828,6 +823,7 @@ async def _revoc_reg_entry_with_fix(
                     rev_list.issuer_id,
                     write_ledger=write_ledger,
                     endorser_did=endorser_did,
+                    profile=profile,
                 )
         except LedgerTransactionError as err:
             if "InvalidClientRequest" in err.roll_up:
@@ -1214,29 +1210,32 @@ async def txn_submit(
         taa_accept: Optional[bool] = None,
         sign_did: DIDInfo = sentinel,
         write_ledger: bool = True,
+        profile: Optional[Profile] = None,
     ) -> str:
         """Submit a transaction to the ledger."""
 
         try:
             async with ledger:
-                return await shield(
-                    ledger.txn_submit(
-                        ledger_transaction,
-                        sign=sign,
-                        taa_accept=taa_accept,
-                        sign_did=sign_did,
-                        write_ledger=write_ledger,
-                    )
-                )
+                kwargs = {
+                    "sign": sign,
+                    "taa_accept": taa_accept,
+                    "sign_did": sign_did,
+                    "write_ledger": write_ledger,
+                }
+
+                if profile is not None:
+                    kwargs["profile"] = profile
+
+                return await shield(ledger.txn_submit(ledger_transaction, **kwargs))
         except LedgerError as err:
             raise AnonCredsRegistrationError(err.roll_up) from err
 
     async def get_schema_info_by_id(
         self, profile: Profile, schema_id: str
-    ) -> AnoncredsSchemaInfo:
+    ) -> AnonCredsSchemaInfo:
         """Get schema info by schema id."""
         schema_id_parts = re.match(r"^(\w+):2:([^:]+):([^:]+)$", schema_id)
-        return AnoncredsSchemaInfo(
+        return AnonCredsSchemaInfo(
             issuer_id=schema_id_parts.group(1),
             name=schema_id_parts.group(2),
             version=schema_id_parts.group(3),

acapy_agent/anoncreds/default/legacy_indy/tests/test_registry.py

@@ -16,9 +16,7 @@
 from .....anoncreds.base import AnonCredsSchemaAlreadyExists
 from .....anoncreds.default.legacy_indy import registry as test_module
 from .....anoncreds.issuer import AnonCredsIssuer
-from .....askar.profile_anon import (
-    AskarAnoncredsProfileSession,
-)
+from .....askar.profile_anon import AskarAnoncredsProfileSession
 from .....connections.models.conn_record import ConnRecord
 from .....core.event_bus import EventBus
 from .....ledger.base import BaseLedger
@@ -31,9 +29,7 @@
 from .....protocols.endorse_transaction.v1_0.models.transaction_record import (
     TransactionRecord,
 )
-from .....revocation_anoncreds.models.issuer_cred_rev_record import (
-    IssuerCredRevRecord,
-)
+from .....revocation_anoncreds.models.issuer_cred_rev_record import IssuerCredRevRecord
 from .....tests import mock
 from .....utils.testing import create_test_profile
 from ....models.credential_definition import (
@@ -51,6 +47,8 @@
     RevRegDefValue,
 )
 from ....models.schema import AnonCredsSchema, GetSchemaResult, SchemaResult
+from .....core.profile import Profile
+from .....wallet.did_info import DIDInfo
 
 B58 = alphabet if isinstance(alphabet, str) else alphabet.decode("ascii")
 INDY_DID = rf"^(did:sov:)?[{B58}]{{21,22}}$"
@@ -1219,3 +1217,92 @@ async def test_get_schem_info(self):
         assert result.issuer_id == "XduBsoPyEA4szYMy3pZ8De"
         assert result.name == "minimal-33279d005748b3cc"
         assert result.version == "1.0"
+
+    @mock.patch.object(
+        IndyLedgerRequestsExecutor,
+        "get_ledger_for_identifier",
+        return_value=(
+            "mock_ledger_id",
+            mock.MagicMock(
+                spec=BaseLedger,
+                send_revoc_reg_entry=mock.CoroutineMock(return_value="mock_seq_no"),
+                __aenter__=mock.CoroutineMock(return_value=mock.MagicMock()),
+                __aexit__=mock.CoroutineMock(return_value=None),
+                profile=mock.MagicMock(spec=Profile),
+            ),
+        ),
+    )
+    @mock.patch.object(AskarAnoncredsProfileSession, "handle")
+    async def test_register_revocation_list_passes_profile(
+        self, mock_askar_handle, mock_get_ledger_for_id
+    ):
+        """Test register_revocation_list passes profile kwarg via helper."""
+        self.profile.inject_or = mock.MagicMock()
+
+        test_profile = self.profile
+
+        test_rev_reg_def = RevRegDef(
+            tag="tag",
+            cred_def_id="IssuerDID:3:CL:1:tag",
+            value=RevRegDefValue(
+                max_cred_num=100, public_keys={}, tails_hash="", tails_location=""
+            ),
+            issuer_id="IssuerDID",
+            type="CL_ACCUM",
+        )
+        test_rev_list = RevList(
+            issuer_id="IssuerDID",
+            current_accumulator="dummy_accum_value",
+            revocation_list=[0],
+            timestamp=1234567890,
+            rev_reg_def_id="IssuerDID:4:IssuerDID:3:CL:1:tag:CL_ACCUM:tag",
+        )
+
+        await self.registry.register_revocation_list(
+            test_profile,
+            test_rev_reg_def,
+            test_rev_list,
+            {},
+        )
+
+        mock_ledger_instance = mock_get_ledger_for_id.return_value[1]
+
+        mock_ledger_instance.send_revoc_reg_entry.assert_called_once()
+
+        _call_args, call_kwargs = mock_ledger_instance.send_revoc_reg_entry.call_args
+
+        assert "profile" in call_kwargs
+        assert call_kwargs["profile"] is test_profile
+        assert call_kwargs["write_ledger"] is True
+
+    async def test_registry_txn_submit_passes_profile(self):
+        """Test registry txn_submit passes profile kwarg to ledger txn_submit."""
+        mock_ledger = mock.MagicMock(BaseLedger, autospec=True)
+        mock_ledger.txn_submit = mock.CoroutineMock(return_value="mock_ledger_response")
+        mock_ledger.__aenter__ = mock.CoroutineMock(return_value=mock_ledger)
+        mock_ledger.__aexit__ = mock.CoroutineMock(return_value=None)
+
+        test_profile = self.profile
+        test_txn_data = '{"a": 1}'
+        test_sign_did = mock.MagicMock(spec=DIDInfo)
+
+        await self.registry.txn_submit(
+            ledger=mock_ledger,
+            ledger_transaction=test_txn_data,
+            sign=True,
+            taa_accept=True,
+            sign_did=test_sign_did,
+            write_ledger=True,
+            profile=test_profile,
+        )
+
+        mock_ledger.txn_submit.assert_called_once()
+
+        _call_args, call_kwargs = mock_ledger.txn_submit.call_args
+
+        assert "profile" in call_kwargs
+        assert call_kwargs["profile"] is test_profile
+        assert call_kwargs["sign"] is True
+        assert call_kwargs["taa_accept"] is True
+        assert call_kwargs["sign_did"] is test_sign_did
+        assert call_kwargs["write_ledger"] is True

acapy_agent/ledger/base.py

@@ -7,6 +7,7 @@
 from hashlib import sha256
 from typing import List, Optional, Sequence, Tuple, Union
 
+from ..core.profile import Profile
 from ..indy.issuer import DEFAULT_CRED_DEF_TAG, IndyIssuer, IndyIssuerError
 from ..messaging.valid import IndyDID
 from ..utils import sentinel
@@ -175,7 +176,7 @@ async def rotate_public_did_keypair(self, next_seed: Optional[str] = None) -> No
         """
 
     @abstractmethod
-    async def get_wallet_public_did(self) -> DIDInfo:
+    async def get_wallet_public_did(self, profile: Optional[Profile] = None) -> DIDInfo:
         """Fetch the public DID from the wallet."""
 
     @abstractmethod
@@ -193,7 +194,7 @@ async def accept_txn_author_agreement(
         """Save a new record recording the acceptance of the TAA."""
 
     @abstractmethod
-    async def get_latest_txn_author_acceptance(self):
+    async def get_latest_txn_author_acceptance(self, profile: Optional[Profile] = None):
         """Look up the latest TAA acceptance."""
 
     def taa_digest(self, version: str, text: str):
@@ -219,6 +220,7 @@ async def txn_submit(
         taa_accept: Optional[bool] = None,
         sign_did: DIDInfo = sentinel,
         write_ledger: bool = True,
+        profile: Optional[Profile] = None,
     ) -> str:
         """Write the provided (signed and possibly endorsed) transaction to the ledger."""
 
@@ -414,6 +416,7 @@ async def send_revoc_reg_entry(
         issuer_did: Optional[str] = None,
         write_ledger: bool = True,
         endorser_did: Optional[str] = None,
+        profile: Optional[Profile] = None,
     ) -> dict:
         """Publish a revocation registry entry to the ledger."""
 
@@ -622,9 +625,7 @@ async def send_schema_anoncreds(
             LedgerObjectAlreadyExistsError: If the schema already exists on the ledger.
 
         """
-        from acapy_agent.anoncreds.default.legacy_indy.registry import (
-            LegacyIndyRegistry,
-        )
+        from acapy_agent.anoncreds.default.legacy_indy.registry import LegacyIndyRegistry
 
         public_info = await self.get_wallet_public_did()
         if not public_info: