rbrazhnyk · Jun 12, 2026 · Jun 12, 2026
@@ -9,6 +9,7 @@
 use AffinidiTdk\Clients\WalletsClient\Model\CreateWalletInput;
 use AffinidiTdk\Clients\WalletsClient\Model\CreateWalletV2Input;
 use AffinidiTdk\Clients\CredentialVerificationClient;
+use AffinidiTdk\Clients\CredentialIssuanceClient;
 
 
 // Load the .env file
@@ -192,6 +193,50 @@ function deleteWallet(string $walletId): void
     }
 }
 
+/**
+ * Get a wallet by ID.
+ */
+function getWalletById(string $walletId): array
+{
+    $originalBasePath = WalletsClient\Configuration::getDefaultConfiguration()->getHost();
+    $host = replaceBaseDomain($originalBasePath);
+
+    $config = WalletsClient\Configuration::getDefaultConfiguration()
+        ->setApiKey('authorization', '', getTokenCallback())
+        ->setHost($host);
+
+    $api = new WalletsClient\Api\WalletApi(config: $config);
+    $response = $api->getWallet($walletId);
+    return decodeJson($response);
+}
+
+/**
+ * Ensure the wallet referenced by the issuance config exists.
+ */
+function ensureConfigWalletExists(string $configId): void
+{
+    $cisBasePath = CredentialIssuanceClient\Configuration::getDefaultConfiguration()->getHost();
+    $cisHost = replaceBaseDomain($cisBasePath);
+    $cisConfig = CredentialIssuanceClient\Configuration::getDefaultConfiguration()
+        ->setApiKey('authorization', '', getTokenCallback())
+        ->setHost($cisHost);
+    $cisConfigApi = new CredentialIssuanceClient\Api\ConfigurationApi(config: $cisConfig);
+
+    $configResponse = $cisConfigApi->getIssuanceConfigById($configId);
+    $config = decodeJson($configResponse);
+
+    $issuerWalletId = $config['issuer_wallet_id'] ?? $config['issuerWalletId'] ?? null;
+    if ($issuerWalletId) {
+        try {
+            getWalletById($issuerWalletId);
+        } catch (WalletsClient\NotFoundError $e) {
+            $newWallet = createWallet();
+            $updatePayload = ['issuerWalletId' => $newWallet['id']];
+            $cisConfigApi->updateIssuanceConfigById($configId, $updatePayload);
+        }
+    }
+}
+
 /**
  * Validates a verifiable credential.
  */
@@ -287,8 +332,32 @@ function checkWalletLimitExceeded(): void
     if (count($data['wallets']) > $WALLETS_LIMIT_THRESHOLD) {
         print("❗️Number of wallets reaching the limit (10). Deleting wallets.");
 
+        // Get protected wallet ID from issuance configuration
+        $protectedWalletId = null;
+        try {
+            $cisBasePath = CredentialIssuanceClient\Configuration::getDefaultConfiguration()->getHost();
+            $cisHost = replaceBaseDomain($cisBasePath);
+            $cisConfig = CredentialIssuanceClient\Configuration::getDefaultConfiguration()
+                ->setApiKey('authorization', '', getTokenCallback())
+                ->setHost($cisHost);
+            $cisConfigApi = new CredentialIssuanceClient\Api\ConfigurationApi(config: $cisConfig);
+            $configListResponse = $cisConfigApi->getIssuanceConfigList();
+            $configList = decodeJson($configListResponse);
+
+            if (!empty($configList['configurations'])) {
+                $protectedWalletId = $configList['configurations'][0]['issuer_wallet_id'] 
+                    ?? $configList['configurations'][0]['issuerWalletId'] 
+                    ?? null;
+            }
+        } catch (Exception $e) {
+            // Proceed without protection if config unavailable
+        }
+
         foreach ($data['wallets'] as $wallet) {
-            deleteWallet($wallet['id']);
+            // Skip deleting the wallet used by the issuance configuration
+            if ($wallet['id'] !== $protectedWalletId) {
+                deleteWallet($wallet['id']);
+            }
         }
     }
 }

@@ -37,13 +37,35 @@ public function testIssuanceConfiguration(): void
         $this->assertEquals($configId, $config['id'] ?? null, 'Fetched config ID does not match.');
     }
 
+    private function getWalletApi(): \AffinidiTdk\Clients\WalletsClient\Api\WalletApi
+    {
+        $originalBasePath = \AffinidiTdk\Clients\WalletsClient\Configuration::getDefaultConfiguration()->getHost();
+        $host = replaceBaseDomain($originalBasePath);
+
+        $config = \AffinidiTdk\Clients\WalletsClient\Configuration::getDefaultConfiguration()
+            ->setApiKey('authorization', '', getTokenCallback())
+            ->setHost($host);
+
+        return new \AffinidiTdk\Clients\WalletsClient\Api\WalletApi(config: $config);
+    }
+
     public function testBatchIssuance(): void
     {
         debugMessage('Start Batch Credential Issuance', [
             'projectId' => self::$projectId,
             'issuanceData' => getConfiguration()['credentialIssuanceData']
         ]);
 
+        // Ensure the configuration's wallet exists before starting issuance
+        $configApi = $this->getConfigurationApi();
+        $configListResponse = $configApi->getIssuanceConfigList();
+        $configData = decodeJson($configListResponse);
+
+        if (!empty($configData['configurations'])) {
+            $configId = $configData['configurations'][0]['id'];
+            ensureConfigWalletExists($configId);
+        }
+
         $issuance = $this->startBatchCredentialIssuance();
         $this->assertArrayHasKey('issuanceId', $issuance);
         $this->assertNotEmpty($issuance['issuanceId']);

@@ -205,7 +205,6 @@ public function testSignAndRevokeLdpCredential(): void
 
         $this->assertArrayHasKey('credential', $data);
         $credential = $data['credential'];
-        echo "\n\033[0;36m[CREDENTIAL]\033[0m " . json_encode($credential, JSON_PRETTY_PRINT) . "\n";
         $this->assertArrayHasKey('proof', $credential);
 
         $revocationListUrl = $credential['credentialStatus']['revocationListCredential'];