Small fix

iden3 · Feb 18, 2025 · cee07b4 · cee07b4
1 parent df9732b
commit cee07b4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/contracts/payment/VCPayment.sol b/contracts/payment/VCPayment.sol
@@ -183,9 +183,10 @@ contract VCPayment is Ownable2StepUpgradeable, ReentrancyGuardUpgradeable {
         uint256 issuerId,
         uint256 schemaHash,
         address withdrawAddress
-    ) external ownerOrIssuer(issuerId, schemaHash) validAddress(withdrawAddress) nonReentrant {
+    ) external onlyOwner validAddress(withdrawAddress) nonReentrant {
         VCPaymentStorage storage $ = _getVCPaymentStorage();
         PaymentData storage payData = $.paymentData[keccak256(abi.encode(issuerId, schemaHash))];
+
         uint256 issuerBalance = $.issuerAddressBalance[payData.withdrawAddress];
         $.issuerAddressBalance[payData.withdrawAddress] = 0;
         $.issuerAddressBalance[withdrawAddress] += issuerBalance;

diff --git a/test/payment/vc-payment.test.ts b/test/payment/vc-payment.test.ts
@@ -137,14 +137,14 @@ describe("VC Payment Contract", () => {
 
     // this should not override the withdrawal balance of issuer 1
     await payment
-      .connect(issuer2Signer)
+      .connect(owner)
       .updateWithdrawAddress(issuerId2.bigInt(), schemaHash3.bigInt(), issuer1Signer.address);
 
     expect(await payment.connect(issuer1Signer).getMyBalance()).to.be.eq(9500);
     expect(await payment.connect(issuer2Signer).getMyBalance()).to.be.eq(0);
 
     await payment
-      .connect(issuer1Signer)
+      .connect(owner)
       .updateWithdrawAddress(issuerId1.bigInt(), schemaHash1.bigInt(), issuer2Signer.address);
 
     expect(await payment.connect(issuer1Signer).getMyBalance()).to.be.eq(0);
@@ -228,11 +228,11 @@ describe("VC Payment Contract", () => {
         .connect(userSigner)
         .updateWithdrawAddress(issuerId1.bigInt(), schemaHash1.bigInt(), issuer2Signer.address),
     )
-      .to.be.revertedWithCustomError(payment, "WrongOwnerOrIssuer")
-      .withArgs(owner.address, issuer1Signer.address, userSigner.address);
+      .to.be.revertedWithCustomError(payment, "OwnableUnauthorizedAccount")
+      .withArgs(userSigner.address);
 
     await payment
-      .connect(issuer1Signer)
+      .connect(owner)
       .updateWithdrawAddress(issuerId1.bigInt(), schemaHash1.bigInt(), issuer2Signer.address);
     const paymentData = await payment
       .connect(issuer2Signer)