Merge pull request #2 from EthSign/feat/v1.1.3

v1.1.3
EthSign · Jul 19, 2024 · 31b7de1 · 31b7de1
2 parents d607fc3 + 7b065f8
commit 31b7de1
Show file tree

Hide file tree

Showing 7 changed files with 182 additions and 93 deletions.
diff --git a/�@��@8 b/�@��@8
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,5 +1,5 @@
 {
-  "solidity.compileUsingRemoteVersion": "v0.8.24+commit.e11b9ed9",
+  "solidity.compileUsingRemoteVersion": "v0.8.26+commit.8a97fa7a",
   "editor.formatOnSave": true,
   "[solidity]": {
     "editor.defaultFormatter": "JuanBlanco.solidity"

diff --git a/foundry.toml b/foundry.toml
@@ -1,7 +1,7 @@
 [profile.default]
 src = "src"
 out = "out"
-solc = "0.8.23"
+solc = "0.8.26"
 bytecode_hash = "none"
 optimizer = true
 optimizer_runs = 50

diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -17,7 +17,7 @@ const config: HardhatUserConfig = {
   solidity: {
     compilers: [
       {
-        version: "0.8.24",
+        version: "0.8.26",
         settings: {
           optimizer: {
             enabled: true,

diff --git a/src/core/SP.sol b/src/core/SP.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GNU AGPLv3
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.26;
 
 import { ISP } from "../interfaces/ISP.sol";
 import { ISPHook } from "../interfaces/ISPHook.sol";
@@ -89,34 +89,6 @@ contract SP is ISP, UUPSUpgradeable, OwnableUpgradeable {
         _callGlobalHook();
     }
 
-    function registerBatch(
-        Schema[] calldata schemas,
-        bytes calldata delegateSignature
-    )
-        external
-        override
-        returns (uint64[] memory schemaIds)
-    {
-        bool delegateMode = delegateSignature.length != 0;
-        address registrant = schemas[0].registrant;
-        if (delegateMode) {
-            // solhint-disable-next-line max-line-length
-            __checkDelegationSignature(schemas[0].registrant, getDelegatedRegisterBatchHash(schemas), delegateSignature);
-        } else {
-            if (schemas[0].registrant != _msgSender()) {
-                revert SchemaWrongRegistrant();
-            }
-        }
-        schemaIds = new uint64[](schemas.length);
-        for (uint256 i = 0; i < schemas.length; i++) {
-            if (delegateMode && schemas[i].registrant != registrant) {
-                revert SchemaWrongRegistrant();
-            }
-            schemaIds[i] = _register(schemas[i]);
-        }
-        _callGlobalHook();
-    }
-
     function attest(
         Attestation calldata attestation,
         string calldata indexingKey,
@@ -605,17 +577,13 @@ contract SP is ISP, UUPSUpgradeable, OwnableUpgradeable {
     }
 
     function version() external pure override returns (string memory) {
-        return "1.1.2";
+        return "1.1.3";
     }
 
     function getDelegatedRegisterHash(Schema memory schema) public pure override returns (bytes32) {
         return keccak256(abi.encode(REGISTER_ACTION_NAME, schema));
     }
 
-    function getDelegatedRegisterBatchHash(Schema[] memory schemas) public pure override returns (bytes32) {
-        return keccak256(abi.encode(REGISTER_ACTION_NAME, schemas));
-    }
-
     function getDelegatedAttestHash(Attestation memory attestation) public pure override returns (bytes32) {
         return keccak256(abi.encode(ATTEST_ACTION_NAME, attestation));
     }
@@ -701,6 +669,7 @@ contract SP is ISP, UUPSUpgradeable, OwnableUpgradeable {
         emit SchemaRegistered(schemaId);
     }
 
+    // solhint-disable-next-line code-complexity
     function _attest(
         Attestation memory attestation,
         string memory indexingKey,
@@ -713,7 +682,6 @@ contract SP is ISP, UUPSUpgradeable, OwnableUpgradeable {
         if ($.paused) revert Paused();
         attestationId = $.attestationCounter++;
         attestation.attestTimestamp = uint64(block.timestamp);
-        attestation.revokeTimestamp = 0;
         // In delegation mode, the attester is already checked ahead of time.
         if (!delegateMode && attestation.attester != _msgSender()) {
             revert AttestationWrongAttester();
@@ -727,6 +695,9 @@ contract SP is ISP, UUPSUpgradeable, OwnableUpgradeable {
         ) {
             revert AttestationWrongAttester();
         }
+        if (attestation.revoked || attestation.revokeTimestamp > 0) {
+            revert AttestationAlreadyRevoked();
+        }
         Schema memory s = $.schemaRegistry[attestation.schemaId];
         if (!__schemaExists(attestation.schemaId)) revert SchemaNonexistent();
         if (s.maxValidFor > 0) {

diff --git a/src/interfaces/ISP.sol b/src/interfaces/ISP.sol
@@ -229,16 +229,6 @@ interface ISP is IVersionable {
     )
         external;
 
-    /**
-     * @notice Batch registers a Schema.
-     */
-    function registerBatch(
-        Schema[] calldata schemas,
-        bytes calldata delegateSignature
-    )
-        external
-        returns (uint64[] calldata schemaIds);
-
     /**
      * @notice Batch attests.
      */
@@ -359,11 +349,6 @@ interface ISP is IVersionable {
      */
     function getDelegatedRegisterHash(Schema memory schema) external pure returns (bytes32);
 
-    /**
-     * @notice Returns the hash that will be used to authorize a delegated batch registration.
-     */
-    function getDelegatedRegisterBatchHash(Schema[] memory schemas) external pure returns (bytes32);
-
     /**
      * @notice Returns the hash that will be used to authorize a delegated attestation.
      */