Merge pull request #159 from futureversecom/SM-108-eth-auth-delegated…

…-signer SM-108 rename signing permission
futureversecom · Dec 11, 2023 · 334b827 · 334b827
2 parents c18ba42 + 62b5331
commit 334b827
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 62 deletions.
diff --git a/common/enum.ts b/common/enum.ts
@@ -1,3 +1,3 @@
 export enum Permission {
-  TicketSigning,
+  PersonalSign,
 }
diff --git a/contracts/AuthorizedAccounts.sol b/contracts/AuthorizedAccounts.sol
@@ -228,7 +228,7 @@ contract AuthorizedAccounts is
      * @param permission The permission needs to be verified with the authorized account
      * @param atBlock The block number to check if the permission is valid between
      * the permission's authorizedAt and unauthorizedAt period. It is added later to prevent
-     * the timing attack. E.g. If the main account authorizes the SigningTicket permission at
+     * the timing attack. E.g. If the main account authorizes the PersonalSign permission at
      * block 1, creates a ticket at block 2, then unauthorizes the permission at block 3, the
      * ticket will be invalid and cannot be redeemed. To avoid this, the `atBlock` param is
      * needed to check if the permission is authorized between its authorizedAt and unauthorizedAt
@@ -299,7 +299,7 @@ contract AuthorizedAccounts is
 
     function getAllPermissions() internal pure returns (Permission[] memory) {
         Permission[] memory permissions = new Permission[](1);
-        permissions[0] = Permission.TicketSigning;
+        permissions[0] = Permission.PersonalSign;
         return permissions;
     }
 }
diff --git a/contracts/interfaces/IAuthorizedAccounts.sol b/contracts/interfaces/IAuthorizedAccounts.sol
@@ -3,9 +3,9 @@ pragma solidity ^0.8.18;
 
 interface IAuthorizedAccounts {
     enum Permission {
-        // TicketSigning permission allows the authorized account to
-        // sign tickets for ticketing redemption.
-        TicketSigning
+        // PersonalSign permission allows the authorized account to
+        // sign on behalf of the sending account.
+        PersonalSign
     }
 
     /**

diff --git a/contracts/payments/SyloTicketing.sol b/contracts/payments/SyloTicketing.sol
@@ -96,8 +96,8 @@ contract SyloTicketing is ISyloTicketing, Initializable, Ownable2StepUpgradeable
     error PenaltyAmountCannotBeZero();
     error UnlockDurationCannotBeZero();
     error AccountCannotBeZeroAddress();
-    error InvalidSenderTicketSigningPermission();
-    error InvalidReceiverTicketSigningPermission();
+    error InvalidSenderSigningPermission();
+    error InvalidReceiverSigningPermission();
 
     error TicketNotWinning();
     error MissingFuturepassAccount(address receiver);
@@ -515,11 +515,11 @@ contract SyloTicketing is ISyloTicketing, Initializable, Ownable2StepUpgradeable
             revert RedeemerCommitMismatch();
         }
 
-        if (!hasTicketSigningPermission(ticket.sender, ticket.generationBlock)) {
-            revert InvalidSenderTicketSigningPermission();
+        if (!hasSigningPermission(ticket.sender, ticket.generationBlock)) {
+            revert InvalidSenderSigningPermission();
         }
-        if (!hasTicketSigningPermission(ticket.receiver, ticket.generationBlock)) {
-            revert InvalidReceiverTicketSigningPermission();
+        if (!hasSigningPermission(ticket.receiver, ticket.generationBlock)) {
+            revert InvalidReceiverSigningPermission();
         }
 
         if (!isValidTicketSig(ticket.sender, senderSig, ticketHash)) {
@@ -599,11 +599,11 @@ contract SyloTicketing is ISyloTicketing, Initializable, Ownable2StepUpgradeable
             revert RedeemerCommitMismatch();
         }
 
-        if (!hasTicketSigningPermission(ticket.sender, ticket.generationBlock)) {
-            revert InvalidSenderTicketSigningPermission();
+        if (!hasSigningPermission(ticket.sender, ticket.generationBlock)) {
+            revert InvalidSenderSigningPermission();
         }
-        if (!hasTicketSigningPermission(receiver, ticket.generationBlock)) {
-            revert InvalidReceiverTicketSigningPermission();
+        if (!hasSigningPermission(receiver, ticket.generationBlock)) {
+            revert InvalidReceiverSigningPermission();
         }
 
         if (!isValidTicketSig(ticket.sender, senderSig, ticketHash)) {
@@ -628,15 +628,15 @@ contract SyloTicketing is ISyloTicketing, Initializable, Ownable2StepUpgradeable
         return (ticketHash, ticketReceiverHash);
     }
 
-    function hasTicketSigningPermission(
+    function hasSigningPermission(
         User memory user,
         uint256 generationBlock
     ) internal view returns (bool) {
         if (user.delegated == address(0)) {
             return true;
         }
 
-        IAuthorizedAccounts.Permission permission = IAuthorizedAccounts.Permission.TicketSigning;
+        IAuthorizedAccounts.Permission permission = IAuthorizedAccounts.Permission.PersonalSign;
         return
             _authorizedAccounts.validatePermission(
                 user.main,

diff --git a/scripts/utils.ts b/scripts/utils.ts
@@ -132,7 +132,7 @@ export async function authorizeAccount(
 ) {
   await contracts.authorizedAccounts
     .connect(main)
-    .authorizeAccount(authorized, [Permission.TicketSigning], {
+    .authorizeAccount(authorized, [Permission.PersonalSign], {
       gasLimit: 1_000_000,
     });
 }

diff --git a/test/authorizedAccount.test.ts b/test/authorizedAccount.test.ts
@@ -19,7 +19,7 @@ describe('Authorized Accounts', () => {
   let authAccountsConnectMain: AuthorizedAccounts;
   let contracts: SyloContracts;
 
-  const permissionList: Permission[] = [Permission.TicketSigning];
+  const permissionList: Permission[] = [Permission.PersonalSign];
 
   before(async () => {
     accounts = await ethers.getSigners();
@@ -312,7 +312,7 @@ describe('Authorized Accounts', () => {
 
   it('can add permission for authorized account', async () => {
     const permission: Permission[] = [];
-    const newPermission: Permission[] = [Permission.TicketSigning];
+    const newPermission: Permission[] = [Permission.PersonalSign];
     await authAccountsConnectMain.authorizeAccount(
       delegatedAccount1,
       permission,
@@ -347,16 +347,16 @@ describe('Authorized Accounts', () => {
     assert.equal(accounts[0].permissions.length, 1);
     assert.equal(
       accounts[0].permissions[0].permission,
-      BigInt(Permission.TicketSigning),
+      BigInt(Permission.PersonalSign),
     );
     assert.equal(accounts[0].permissions[0].authorizedAt, await currentBlock());
   });
 
   it('can add multiple permissions (with duplicated permissions) for authorized account', async () => {
     const permission: Permission[] = [];
     const newPermissions: Permission[] = [
-      Permission.TicketSigning,
-      Permission.TicketSigning,
+      Permission.PersonalSign,
+      Permission.PersonalSign,
     ];
     await authAccountsConnectMain.authorizeAccount(
       delegatedAccount1,
@@ -388,13 +388,13 @@ describe('Authorized Accounts', () => {
   });
 
   it('can remove multiple permissions (with duplicated permissions) for authorized account', async () => {
-    const permissionsToAdd: Permission[] = [Permission.TicketSigning];
+    const permissionsToAdd: Permission[] = [Permission.PersonalSign];
     const permissionsToRemove: Permission[] = [
-      Permission.TicketSigning,
-      Permission.TicketSigning,
+      Permission.PersonalSign,
+      Permission.PersonalSign,
     ];
     const emptyPermissions: Permission[] = [];
-    const permission2: Permission[] = [Permission.TicketSigning];
+    const permission2: Permission[] = [Permission.PersonalSign];
 
     await authAccountsConnectMain.authorizeAccount(
       delegatedAccount1,
@@ -450,7 +450,7 @@ describe('Authorized Accounts', () => {
     assert.equal(accounts[0].permissions.length, 1);
     assert.equal(
       accounts[0].permissions[0].permission,
-      BigInt(Permission.TicketSigning),
+      BigInt(Permission.PersonalSign),
     );
     assert.equal(accounts[0].permissions[0].authorizedAt, authorizedAtBlock);
     assert.equal(
@@ -565,7 +565,7 @@ describe('Authorized Accounts', () => {
 
   it('cannot validate permission with invalid main address ', async () => {
     const main = ethers.ZeroAddress;
-    const permission = Permission.TicketSigning;
+    const permission = Permission.PersonalSign;
     await expect(
       authAccountsConnectMain.validatePermission(
         main,
@@ -581,7 +581,7 @@ describe('Authorized Accounts', () => {
 
   it('cannot validate permission with invalid authorized address ', async () => {
     const authorizedAddress = ethers.ZeroAddress;
-    const permission = Permission.TicketSigning;
+    const permission = Permission.PersonalSign;
     await expect(
       authAccountsConnectMain.validatePermission(
         mainAccountAddress,
@@ -617,7 +617,7 @@ describe('Authorized Accounts', () => {
     const validate = await authAccountsConnectMain.validatePermission(
       mainAccountAddress,
       delegatedAccount1,
-      Permission.TicketSigning,
+      Permission.PersonalSign,
       await currentBlock(),
     );
     assert.equal(validate, false);
@@ -632,7 +632,7 @@ describe('Authorized Accounts', () => {
     const validate = await authAccountsConnectMain.validatePermission(
       mainAccountAddress,
       delegatedAccount2,
-      Permission.TicketSigning,
+      Permission.PersonalSign,
       await currentBlock(),
     );
 
@@ -649,7 +649,7 @@ describe('Authorized Accounts', () => {
     const validate = await authAccountsConnectMain.validatePermission(
       mainAccountAddress,
       delegatedAccount1,
-      Permission.TicketSigning,
+      Permission.PersonalSign,
       await currentBlock(),
     );
 
@@ -670,7 +670,7 @@ describe('Authorized Accounts', () => {
     let validate = await authContract.validatePermission(
       mainAccountAddress,
       delegatedAccount1,
-      Permission.TicketSigning,
+      Permission.PersonalSign,
       1000,
     );
     assert.equal(validate, false);
@@ -682,7 +682,7 @@ describe('Authorized Accounts', () => {
     validate = await authContract.validatePermission(
       mainAccountAddress,
       delegatedAccount1,
-      Permission.TicketSigning,
+      Permission.PersonalSign,
       1000,
     );
     assert.equal(validate, true);
@@ -695,7 +695,7 @@ describe('Authorized Accounts', () => {
     validate = await authContract.validatePermission(
       mainAccountAddress,
       delegatedAccount1,
-      Permission.TicketSigning,
+      Permission.PersonalSign,
       (await currentBlock()) - 3n,
     );
     assert.equal(validate, true);
@@ -704,7 +704,7 @@ describe('Authorized Accounts', () => {
     validate = await authContract.validatePermission(
       mainAccountAddress,
       delegatedAccount1,
-      Permission.TicketSigning,
+      Permission.PersonalSign,
       authBlock,
     );
     assert.equal(validate, true);
@@ -713,7 +713,7 @@ describe('Authorized Accounts', () => {
     validate = await authContract.validatePermission(
       mainAccountAddress,
       delegatedAccount1,
-      Permission.TicketSigning,
+      Permission.PersonalSign,
       authBlock - 1n,
     );
     assert.equal(validate, false);
@@ -722,7 +722,7 @@ describe('Authorized Accounts', () => {
     validate = await authContract.validatePermission(
       mainAccountAddress,
       delegatedAccount1,
-      Permission.TicketSigning,
+      Permission.PersonalSign,
       unauthBlock + 1n,
     );
     assert.equal(validate, false);
@@ -731,7 +731,7 @@ describe('Authorized Accounts', () => {
     validate = await authContract.validatePermission(
       mainAccountAddress,
       delegatedAccount1,
-      Permission.TicketSigning,
+      Permission.PersonalSign,
       unauthBlock + 123n,
     );
     assert.equal(validate, false);
@@ -743,7 +743,7 @@ describe('Authorized Accounts', () => {
     validate = await authContract.validatePermission(
       mainAccountAddress,
       delegatedAccount1,
-      Permission.TicketSigning,
+      Permission.PersonalSign,
       authBlock,
     );
     assert.equal(validate, true);
@@ -752,7 +752,7 @@ describe('Authorized Accounts', () => {
     validate = await authContract.validatePermission(
       mainAccountAddress,
       delegatedAccount1,
-      Permission.TicketSigning,
+      Permission.PersonalSign,
       authBlock + 10n,
     );
     assert.equal(validate, true);
@@ -761,7 +761,7 @@ describe('Authorized Accounts', () => {
     validate = await authContract.validatePermission(
       mainAccountAddress,
       delegatedAccount1,
-      Permission.TicketSigning,
+      Permission.PersonalSign,
       authBlock - 3n,
     );
     assert.equal(validate, false);
@@ -776,7 +776,7 @@ describe('Authorized Accounts', () => {
     validate = await authContract.validatePermission(
       mainAccountAddress,
       delegatedAccount1,
-      Permission.TicketSigning,
+      Permission.PersonalSign,
       authBlock - 3n,
     );
     assert.equal(validate, false);
@@ -785,7 +785,7 @@ describe('Authorized Accounts', () => {
     validate = await authContract.validatePermission(
       mainAccountAddress,
       delegatedAccount1,
-      Permission.TicketSigning,
+      Permission.PersonalSign,
       authBlock + 3n,
     );
     assert.equal(validate, true);
@@ -794,7 +794,7 @@ describe('Authorized Accounts', () => {
     validate = await authContract.validatePermission(
       mainAccountAddress,
       delegatedAccount1,
-      Permission.TicketSigning,
+      Permission.PersonalSign,
       authBlock - 1n,
     );
     assert.equal(validate, false);
@@ -809,7 +809,7 @@ describe('Authorized Accounts', () => {
     const validate = await authAccountsConnectMain.validatePermission(
       mainAccountAddress,
       delegatedAccount1,
-      Permission.TicketSigning,
+      Permission.PersonalSign,
       (await currentBlock()) + 1n,
     );
 

diff --git a/test/payments/multiReceiverTicketing.test.ts b/test/payments/multiReceiverTicketing.test.ts
@@ -252,7 +252,7 @@ describe('MultiReceiverTicketing', () => {
       ),
     ).to.be.revertedWithCustomError(
       syloTicketing,
-      'InvalidSenderTicketSigningPermission',
+      'InvalidSenderSigningPermission',
     );
 
     await expect(
@@ -265,7 +265,7 @@ describe('MultiReceiverTicketing', () => {
       ),
     ).to.be.revertedWithCustomError(
       syloTicketing,
-      'InvalidReceiverTicketSigningPermission',
+      'InvalidReceiverSigningPermission',
     );
 
     const malformedSig =