Update solidity version and remove event definition duplicates (#827)

* Remove protocol event duplicate definitions * Bump solidity version * remove jeweler lib event
bosonprotocol · Nov 30, 2023 · dba3c2b · dba3c2b
1 parent 2261934
commit dba3c2b
Show file tree

Hide file tree

Showing 132 changed files with 342 additions and 370 deletions.
diff --git a/contracts/access/AccessControl.sol b/contracts/access/AccessControl.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts (last updated v4.7.0) (access/AccessControl.sol)
 
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import "../interfaces/IAccessControl.sol";
 import "../interfaces/IERC165.sol";

diff --git a/contracts/access/AccessController.sol b/contracts/access/AccessController.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import "../domain/BosonConstants.sol";
 import "./AccessControl.sol";

diff --git a/contracts/diamond/DiamondLib.sol b/contracts/diamond/DiamondLib.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { IAccessControl } from "../interfaces/IAccessControl.sol";
 import { IDiamondCut } from "../interfaces/diamond/IDiamondCut.sol";

diff --git a/contracts/diamond/JewelerLib.sol b/contracts/diamond/JewelerLib.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { DiamondLib } from "./DiamondLib.sol";
 import { IDiamondCut } from "../interfaces/diamond/IDiamondCut.sol";
@@ -24,8 +24,6 @@ import { IDiamondCut } from "../interfaces/diamond/IDiamondCut.sol";
  */
 
 library JewelerLib {
-    event DiamondCut(IDiamondCut.FacetCut[] _diamondCut, address _init, bytes _calldata);
-
     bytes32 internal constant CLEAR_ADDRESS_MASK = bytes32(uint256(0xffffffffffffffffffffffff));
     bytes32 internal constant CLEAR_SELECTOR_MASK = bytes32(uint256(0xffffffff << 224));
 
@@ -81,7 +79,7 @@ library JewelerLib {
         }
 
         // Notify listeners of state change
-        emit DiamondCut(_facetCuts, _init, _calldata);
+        emit IDiamondCut.DiamondCut(_facetCuts, _init, _calldata);
 
         // Initialize the facet
         initializeDiamondCut(_init, _calldata);

diff --git a/contracts/diamond/ProtocolDiamond.sol b/contracts/diamond/ProtocolDiamond.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import "../domain/BosonConstants.sol";
 import { IAccessControl } from "../interfaces/IAccessControl.sol";

diff --git a/contracts/diamond/facets/DiamondCutFacet.sol b/contracts/diamond/facets/DiamondCutFacet.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import "../../domain/BosonConstants.sol";
 import { IDiamondCut } from "../../interfaces/diamond/IDiamondCut.sol";

diff --git a/contracts/diamond/facets/DiamondLoupeFacet.sol b/contracts/diamond/facets/DiamondLoupeFacet.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { IDiamondLoupe } from "../../interfaces/diamond/IDiamondLoupe.sol";
 import { DiamondLib } from "../DiamondLib.sol";

diff --git a/contracts/diamond/facets/ERC165Facet.sol b/contracts/diamond/facets/ERC165Facet.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import "../../domain/BosonConstants.sol";
 import { DiamondLib } from "../DiamondLib.sol";

diff --git a/contracts/domain/BosonConstants.sol b/contracts/domain/BosonConstants.sol
@@ -1,7 +1,7 @@
 import "./BosonTypes.sol";
 
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 // Access Control Roles
 bytes32 constant ADMIN = keccak256("ADMIN"); // Role Admin

diff --git a/contracts/domain/BosonErrors.sol b/contracts/domain/BosonErrors.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 interface BosonErrors {
     // Pause related

diff --git a/contracts/domain/BosonTypes.sol b/contracts/domain/BosonTypes.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 /**
  * @title BosonTypes

diff --git a/contracts/example/SnapshotGate/SnapshotGate.sol b/contracts/example/SnapshotGate/SnapshotGate.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { IBosonExchangeHandler } from "../../interfaces/handlers/IBosonExchangeHandler.sol";
 import { IBosonOfferHandler } from "../../interfaces/handlers/IBosonOfferHandler.sol";

diff --git a/contracts/example/support/ERC721.sol b/contracts/example/support/ERC721.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts (last updated v4.7.0) (token/ERC721/ERC721.sol)
 
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import "../../interfaces/IERC721.sol";
 import "../../interfaces/IERC721Receiver.sol";

diff --git a/contracts/example/support/IERC721Metadata.sol b/contracts/example/support/IERC721Metadata.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts v4.4.1 (token/ERC721/extensions/IERC721Metadata.sol)
 
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import "../../interfaces/IERC721.sol";
 

diff --git a/contracts/interfaces/DAIAliases.sol b/contracts/interfaces/DAIAliases.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 /**
  * @dev DAI specific aliases for ERC20 functions

diff --git a/contracts/interfaces/IAccessControl.sol b/contracts/interfaces/IAccessControl.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts v4.4.1 (access/IAccessControl.sol)
 
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 /**
  * @dev External interface of AccessControl declared to support ERC165 detection.

diff --git a/contracts/interfaces/IERC1155.sol b/contracts/interfaces/IERC1155.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts (last updated v4.7.0) (token/ERC1155/IERC1155.sol)
 
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import "./IERC165.sol";
 

diff --git a/contracts/interfaces/IERC165.sol b/contracts/interfaces/IERC165.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts v4.4.1 (utils/introspection/IERC165.sol)
 
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 /**
  * @dev Interface of the ERC165 standard, as defined in the

diff --git a/contracts/interfaces/IERC20.sol b/contracts/interfaces/IERC20.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 /**
  * @dev Interface of the ERC20 standard as defined in the EIP.

diff --git a/contracts/interfaces/IERC20Metadata.sol b/contracts/interfaces/IERC20Metadata.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import "./IERC20.sol";
 

diff --git a/contracts/interfaces/IERC2981.sol b/contracts/interfaces/IERC2981.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts (last updated v4.6.0) (interfaces/IERC2981.sol)
 
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import "./IERC165.sol";
 

diff --git a/contracts/interfaces/IERC721.sol b/contracts/interfaces/IERC721.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts v4.4.1 (token/ERC721/IERC721.sol)
 
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import "./IERC165.sol";
 

diff --git a/contracts/interfaces/IERC721Receiver.sol b/contracts/interfaces/IERC721Receiver.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts (last updated v4.6.0) (token/ERC721/IERC721Receiver.sol)
 
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 /**
  * @title ERC721 token receiver interface

diff --git a/contracts/interfaces/IInitializableVoucherClone.sol b/contracts/interfaces/IInitializableVoucherClone.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import "../domain/BosonTypes.sol";
 

diff --git a/contracts/interfaces/ITwinToken.sol b/contracts/interfaces/ITwinToken.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts v4.4.1 (token/ERC721/IERC721.sol)
 
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import "./IERC165.sol";
 

diff --git a/contracts/interfaces/IWrappedNative.sol b/contracts/interfaces/IWrappedNative.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 /**
  * @title IWrappedNative

diff --git a/contracts/interfaces/clients/IBosonVoucher.sol b/contracts/interfaces/clients/IBosonVoucher.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { IERC721Upgradeable } from "@openzeppelin/contracts-upgradeable/token/ERC721/IERC721Upgradeable.sol";
 import { IERC721MetadataUpgradeable } from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/IERC721MetadataUpgradeable.sol";

diff --git a/contracts/interfaces/clients/IClientExternalAddresses.sol b/contracts/interfaces/clients/IClientExternalAddresses.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { IAccessControl } from "../IAccessControl.sol";
 import { IClientExternalAddressesEvents } from "../events/IClientExternalAddressesEvents.sol";

diff --git a/contracts/interfaces/diamond/IDiamondCut.sol b/contracts/interfaces/diamond/IDiamondCut.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 /**
  * @title IDiamondCut

diff --git a/contracts/interfaces/diamond/IDiamondLoupe.sol b/contracts/interfaces/diamond/IDiamondLoupe.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 /**
  * @title IDiamondLoupe

diff --git a/contracts/interfaces/diamond/IERC165Extended.sol b/contracts/interfaces/diamond/IERC165Extended.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 /**
  * @title IDiamondCut

diff --git a/contracts/interfaces/events/IBosonAccountEvents.sol b/contracts/interfaces/events/IBosonAccountEvents.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { BosonTypes } from "../../domain/BosonTypes.sol";
 

diff --git a/contracts/interfaces/events/IBosonBundleEvents.sol b/contracts/interfaces/events/IBosonBundleEvents.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { BosonTypes } from "../../domain/BosonTypes.sol";
 

diff --git a/contracts/interfaces/events/IBosonConfigEvents.sol b/contracts/interfaces/events/IBosonConfigEvents.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { BosonTypes } from "../../domain/BosonTypes.sol";
 

diff --git a/contracts/interfaces/events/IBosonDisputeEvents.sol b/contracts/interfaces/events/IBosonDisputeEvents.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { BosonTypes } from "../../domain/BosonTypes.sol";
 

diff --git a/contracts/interfaces/events/IBosonExchangeEvents.sol b/contracts/interfaces/events/IBosonExchangeEvents.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { BosonTypes } from "../../domain/BosonTypes.sol";
 

diff --git a/contracts/interfaces/events/IBosonFundsEvents.sol b/contracts/interfaces/events/IBosonFundsEvents.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { BosonTypes } from "../../domain/BosonTypes.sol";
 

diff --git a/contracts/interfaces/events/IBosonGroupEvents.sol b/contracts/interfaces/events/IBosonGroupEvents.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { BosonTypes } from "../../domain/BosonTypes.sol";
 

diff --git a/contracts/interfaces/events/IBosonMetaTransactionsEvents.sol b/contracts/interfaces/events/IBosonMetaTransactionsEvents.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 /**
  * @title IBosonMetaTransactionsEvents

diff --git a/contracts/interfaces/events/IBosonOfferEvents.sol b/contracts/interfaces/events/IBosonOfferEvents.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { BosonTypes } from "../../domain/BosonTypes.sol";
 

diff --git a/contracts/interfaces/events/IBosonPauseEvents.sol b/contracts/interfaces/events/IBosonPauseEvents.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { BosonTypes } from "../../domain/BosonTypes.sol";
 

diff --git a/contracts/interfaces/events/IBosonProtocolInitializationEvents.sol b/contracts/interfaces/events/IBosonProtocolInitializationEvents.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 /**
  * @title IBosonInitializationEvents

diff --git a/contracts/interfaces/events/IBosonTwinEvents.sol b/contracts/interfaces/events/IBosonTwinEvents.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { BosonTypes } from "../../domain/BosonTypes.sol";
 

diff --git a/contracts/interfaces/events/IClientExternalAddressesEvents.sol b/contracts/interfaces/events/IClientExternalAddressesEvents.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 /**
  * @title IClientExternalAddressesEvents

diff --git a/contracts/interfaces/handlers/IBosonAccountHandler.sol b/contracts/interfaces/handlers/IBosonAccountHandler.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { BosonTypes } from "../../domain/BosonTypes.sol";
 import { BosonErrors } from "../../domain/BosonErrors.sol";

diff --git a/contracts/interfaces/handlers/IBosonBundleHandler.sol b/contracts/interfaces/handlers/IBosonBundleHandler.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { BosonTypes } from "../../domain/BosonTypes.sol";
 import { BosonErrors } from "../../domain/BosonErrors.sol";

diff --git a/contracts/interfaces/handlers/IBosonConfigHandler.sol b/contracts/interfaces/handlers/IBosonConfigHandler.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { BosonTypes } from "../../domain/BosonTypes.sol";
 import { BosonErrors } from "../../domain/BosonErrors.sol";

diff --git a/contracts/interfaces/handlers/IBosonDisputeHandler.sol b/contracts/interfaces/handlers/IBosonDisputeHandler.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { BosonTypes } from "../../domain/BosonTypes.sol";
 import { BosonErrors } from "../../domain/BosonErrors.sol";

diff --git a/contracts/interfaces/handlers/IBosonExchangeHandler.sol b/contracts/interfaces/handlers/IBosonExchangeHandler.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { BosonTypes } from "../../domain/BosonTypes.sol";
 import { BosonErrors } from "../../domain/BosonErrors.sol";

diff --git a/contracts/interfaces/handlers/IBosonFundsHandler.sol b/contracts/interfaces/handlers/IBosonFundsHandler.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { BosonTypes } from "../../domain/BosonTypes.sol";
 import { BosonErrors } from "../../domain/BosonErrors.sol";

diff --git a/contracts/interfaces/handlers/IBosonGroupHandler.sol b/contracts/interfaces/handlers/IBosonGroupHandler.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { BosonTypes } from "../../domain/BosonTypes.sol";
 import { BosonErrors } from "../../domain/BosonErrors.sol";