caching system : re-calculated domain separator by comparing the curr…

…ent chain id and earlier chain id
bosonprotocol · Sep 22, 2022 · 29af526 · 29af526
1 parent b8e56ce
commit 29af526
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/contracts/domain/BosonConstants.sol b/contracts/domain/BosonConstants.sol
@@ -159,6 +159,8 @@ string constant FEE_PERCENTAGE_INVALID = "Percentage representation must be less
 string constant VALUE_ZERO_NOT_ALLOWED = "Value must be greater than 0";
 
 // EIP712Lib
+string constant PROTOCOL_NAME = "BosonProtocolDiamond";
+string constant PROTOCOL_VERSION = "V1";
 bytes32 constant EIP712_DOMAIN_TYPEHASH = keccak256(
     bytes("EIP712Domain(string name,string version,address verifyingContract,bytes32 salt)")
 );

diff --git a/contracts/protocol/facets/ConfigHandlerFacet.sol b/contracts/protocol/facets/ConfigHandlerFacet.sol
@@ -66,7 +66,9 @@ contract ConfigHandlerFacet is IBosonConfigHandler, ProtocolBase {
 
         // Initialize protocol meta-transaction config params
         ProtocolLib.ProtocolMetaTxInfo storage pmti = protocolMetaTxInfo();
-        pmti.domainSeparator = EIP712Lib.domainSeparator("BosonProtocolDiamond", "V1");
+        pmti.domainSeparator = EIP712Lib.domainSeparator(PROTOCOL_NAME, PROTOCOL_VERSION);
+        pmti.cachedChainId = block.chainid;
+        pmti.cachedThis = address(this);
     }
 
     /**

diff --git a/contracts/protocol/libs/EIP712Lib.sol b/contracts/protocol/libs/EIP712Lib.sol
@@ -63,12 +63,19 @@ library EIP712Lib {
     }
 
     /**
-     * @notice Gets the domain separator from storage.
+     * @notice Gets the domain separator from storage if matches with the chain id and diamond address, else, build new domain separator.
      *
-     * @return the domain separator from storage
+     * @return the domain separator
      */
     function getDomainSeparator() private view returns (bytes32) {
-        return ProtocolLib.protocolMetaTxInfo().domainSeparator;
+        address cachedThis = ProtocolLib.protocolMetaTxInfo().cachedThis;
+        uint256 cachedChainId = ProtocolLib.protocolMetaTxInfo().cachedChainId;
+
+        if (address(this) == cachedThis && block.chainid == cachedChainId) {
+            return ProtocolLib.protocolMetaTxInfo().domainSeparator;
+        } else {
+            return domainSeparator(PROTOCOL_NAME, PROTOCOL_VERSION);
+        }
     }
 
     /**

diff --git a/contracts/protocol/libs/ProtocolLib.sol b/contracts/protocol/libs/ProtocolLib.sol
@@ -200,6 +200,10 @@ library ProtocolLib {
         bool isMetaTransaction;
         // The domain Separator of the protocol
         bytes32 domainSeparator;
+        // The cached chain id
+        uint256 cachedChainId;
+        // The cached address of the diamond
+        address cachedThis;
         // nonce => existance of nonce in the mapping
         mapping(uint256 => bool) usedNonce;
         // map function name to input type