Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update solidity version and remove event definition duplicates #827

Merged
merged 4 commits into from
Nov 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion contracts/access/AccessControl.sol
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion contracts/access/AccessController.sol
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion contracts/diamond/DiamondLib.sol
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
6 changes: 2 additions & 4 deletions contracts/diamond/JewelerLib.sol
Original file line number Diff line number Diff line change
@@ -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";
Expand All @@ -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));

Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion contracts/diamond/ProtocolDiamond.sol
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion contracts/diamond/facets/DiamondCutFacet.sol
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion contracts/diamond/facets/DiamondLoupeFacet.sol
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion contracts/diamond/facets/ERC165Facet.sol
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion contracts/domain/BosonConstants.sol
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion contracts/domain/BosonErrors.sol
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion contracts/domain/BosonTypes.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-3.0-or-later
pragma solidity 0.8.21;
pragma solidity 0.8.22;

/**
* @title BosonTypes
Expand Down
2 changes: 1 addition & 1 deletion contracts/example/SnapshotGate/SnapshotGate.sol
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion contracts/example/support/ERC721.sol
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion contracts/example/support/IERC721Metadata.sol
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/DAIAliases.sol
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/IAccessControl.sol
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/IERC1155.sol
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/IERC165.sol
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/IERC20.sol
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/IERC20Metadata.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.21;
pragma solidity 0.8.22;

import "./IERC20.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/IERC2981.sol
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/IERC721.sol
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/IERC721Receiver.sol
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/IInitializableVoucherClone.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.21;
pragma solidity 0.8.22;

import "../domain/BosonTypes.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/ITwinToken.sol
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/IWrappedNative.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.21;
pragma solidity 0.8.22;

/**
* @title IWrappedNative
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/clients/IBosonVoucher.sol
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/clients/IClientExternalAddresses.sol
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/diamond/IDiamondCut.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.21;
pragma solidity 0.8.22;

/**
* @title IDiamondCut
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/diamond/IDiamondLoupe.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.21;
pragma solidity 0.8.22;

/**
* @title IDiamondLoupe
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/diamond/IERC165Extended.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.21;
pragma solidity 0.8.22;

/**
* @title IDiamondCut
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/events/IBosonAccountEvents.sol
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/events/IBosonBundleEvents.sol
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/events/IBosonConfigEvents.sol
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/events/IBosonDisputeEvents.sol
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/events/IBosonExchangeEvents.sol
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/events/IBosonFundsEvents.sol
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/events/IBosonGroupEvents.sol
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-3.0-or-later
pragma solidity 0.8.21;
pragma solidity 0.8.22;

/**
* @title IBosonMetaTransactionsEvents
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/events/IBosonOfferEvents.sol
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/events/IBosonPauseEvents.sol
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-3.0-or-later
pragma solidity 0.8.21;
pragma solidity 0.8.22;

/**
* @title IBosonInitializationEvents
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/events/IBosonTwinEvents.sol
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-3.0-or-later
pragma solidity 0.8.21;
pragma solidity 0.8.22;

/**
* @title IClientExternalAddressesEvents
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/handlers/IBosonAccountHandler.sol
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/handlers/IBosonBundleHandler.sol
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/handlers/IBosonConfigHandler.sol
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/handlers/IBosonDisputeHandler.sol
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/handlers/IBosonExchangeHandler.sol
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/handlers/IBosonFundsHandler.sol
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/handlers/IBosonGroupHandler.sol
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
Loading