Merge pull request #168 from api3dao/v3

v3

contracts/access-control-registry/AccessControlRegistry.sol

@@ -1,9 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.17;
 
-import "@openzeppelin/contracts/metatx/ERC2771Context.sol";
 import "@openzeppelin/contracts/access/AccessControl.sol";
-import "../utils/ExpiringMetaTxForwarder.sol";
 import "../utils/SelfMulticall.sol";
 import "./RoleDeriver.sol";
 import "./interfaces/IAccessControlRegistry.sol";
@@ -18,16 +16,11 @@ import "./interfaces/IAccessControlRegistry.sol";
 /// roles and grant these to accounts. Each role has a description, and roles
 /// adminned by the same role cannot have the same description.
 contract AccessControlRegistry is
- ERC2771Context,
  AccessControl,
- ExpiringMetaTxForwarder,
  SelfMulticall,
  RoleDeriver,
  IAccessControlRegistry
 {
- /// @dev AccessControlRegistry is its own trusted meta-tx forwarder
- constructor() ERC2771Context(address(this)) {}
-
  /// @notice Initializes the manager by initializing its root role and
  /// granting it to them
  /// @dev Anyone can initialize a manager. An uninitialized manager
@@ -95,26 +88,4 @@ contract AccessControlRegistry is
  }
  grantRole(role, _msgSender());
  }
-
- /// @dev See Context.sol
- function _msgSender()
- internal
- view
- virtual
- override(Context, ERC2771Context)
- returns (address)
- {
- return ERC2771Context._msgSender();
- }
-
- /// @dev See Context.sol
- function _msgData()
- internal
- view
- virtual
- override(Context, ERC2771Context)
- returns (bytes calldata)
- {
- return ERC2771Context._msgData();
- }
 }

contracts/access-control-registry/interfaces/IAccessControlRegistry.sol

@@ -2,14 +2,9 @@
 pragma solidity ^0.8.0;
 
 import "@openzeppelin/contracts/access/IAccessControl.sol";
-import "../../utils/interfaces/IExpiringMetaTxForwarder.sol";
 import "../../utils/interfaces/ISelfMulticall.sol";
 
-interface IAccessControlRegistry is
- IAccessControl,
- IExpiringMetaTxForwarder,
- ISelfMulticall
-{
+interface IAccessControlRegistry is IAccessControl, ISelfMulticall {
  event InitializedManager(
  bytes32 indexed rootRole,
  address indexed manager,

contracts/allocators/Allocator.sol

@@ -39,7 +39,7 @@ abstract contract Allocator is IAllocator {
  bytes32(0)
  ) {
  _resetSlot(airnode, slotIndex);
- emit ResetSlot(airnode, slotIndex, _msgSender());
+ emit ResetSlot(airnode, slotIndex, msg.sender);
  }
  }
 
@@ -70,15 +70,15 @@ abstract contract Allocator is IAllocator {
  _resetSlot(airnode, slotIndex);
  airnodeToSlotIndexToSlot[airnode][slotIndex] = Slot({
  subscriptionId: subscriptionId,
- setter: _msgSender(),
+ setter: msg.sender,
  expirationTimestamp: expirationTimestamp
  });
  emit SetSlot(
  airnode,
  slotIndex,
  subscriptionId,
  expirationTimestamp,
- _msgSender()
+ msg.sender
  );
  }
 
@@ -87,12 +87,9 @@ abstract contract Allocator is IAllocator {
  /// @param slotIndex Index of the subscription slot to be reset
  function _resetSlot(address airnode, uint256 slotIndex) private {
  require(
- slotCanBeResetByAccount(airnode, slotIndex, _msgSender()),
+ slotCanBeResetByAccount(airnode, slotIndex, msg.sender),
  "Cannot reset slot"
  );
  delete airnodeToSlotIndexToSlot[airnode][slotIndex];
  }
-
- /// @dev See Context.sol
- function _msgSender() internal view virtual returns (address sender);
 }

contracts/allocators/AllocatorWithAirnode.sol

@@ -1,15 +1,13 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.17;
 
-import "@openzeppelin/contracts/metatx/ERC2771Context.sol";
 import "../access-control-registry/AccessControlRegistryAdminned.sol";
 import "./Allocator.sol";
 import "./interfaces/IAllocatorWithAirnode.sol";
 
 /// @title Contract that Airnode operators can use to temporarily
 /// allocate subscription slots for the respective Airnodes
 contract AllocatorWithAirnode is
- ERC2771Context,
  AccessControlRegistryAdminned,
  Allocator,
  IAllocatorWithAirnode
@@ -23,7 +21,6 @@ contract AllocatorWithAirnode is
  address _accessControlRegistry,
  string memory _adminRoleDescription
  )
- ERC2771Context(_accessControlRegistry)
  AccessControlRegistryAdminned(
  _accessControlRegistry,
  _adminRoleDescription
@@ -43,7 +40,7 @@ contract AllocatorWithAirnode is
  uint32 expirationTimestamp
  ) external override {
  require(
- hasSlotSetterRoleOrIsAirnode(airnode, _msgSender()),
+ hasSlotSetterRoleOrIsAirnode(airnode, msg.sender),
  "Sender cannot set slot"
  );
  _setSlot(airnode, slotIndex, subscriptionId, expirationTimestamp);
@@ -100,15 +97,4 @@ contract AllocatorWithAirnode is
  airnodeToSlotIndexToSlot[airnode][slotIndex].setter
  );
  }
-
- /// @dev See Context.sol
- function _msgSender()
- internal
- view
- virtual
- override(Allocator, ERC2771Context)
- returns (address)
- {
- return ERC2771Context._msgSender();
- }
 }

contracts/allocators/AllocatorWithManager.sol

@@ -1,15 +1,13 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.17;
 
-import "@openzeppelin/contracts/metatx/ERC2771Context.sol";
 import "../access-control-registry/AccessControlRegistryAdminnedWithManager.sol";
 import "./Allocator.sol";
 import "./interfaces/IAllocatorWithManager.sol";
 
 /// @title Contract that Airnode operators can use to temporarily
 /// allocate subscription slots for Airnodes
 contract AllocatorWithManager is
- ERC2771Context,
  AccessControlRegistryAdminnedWithManager,
  Allocator,
  IAllocatorWithManager
@@ -25,7 +23,6 @@ contract AllocatorWithManager is
  string memory _adminRoleDescription,
  address _manager
  )
- ERC2771Context(_accessControlRegistry)
  AccessControlRegistryAdminnedWithManager(
  _accessControlRegistry,
  _adminRoleDescription,
@@ -51,7 +48,7 @@ contract AllocatorWithManager is
  uint32 expirationTimestamp
  ) external override {
  require(
- hasSlotSetterRoleOrIsManager(_msgSender()),
+ hasSlotSetterRoleOrIsManager(msg.sender),
  "Sender cannot set slot"
  );
  _setSlot(airnode, slotIndex, subscriptionId, expirationTimestamp);
@@ -84,15 +81,4 @@ contract AllocatorWithManager is
  airnodeToSlotIndexToSlot[airnode][slotIndex].setter
  );
  }
-
- /// @dev See Context.sol
- function _msgSender()
- internal
- view
- virtual
- override(Allocator, ERC2771Context)
- returns (address)
- {
- return ERC2771Context._msgSender();
- }
 }

contracts/authorizers/RequesterAuthorizer.sol

@@ -64,7 +64,7 @@ abstract contract RequesterAuthorizer is IRequesterAuthorizer {
  airnode,
  requester,
  expirationTimestamp,
- _msgSender()
+ msg.sender
  );
  }
 
@@ -88,7 +88,7 @@ abstract contract RequesterAuthorizer is IRequesterAuthorizer {
  airnode,
  requester,
  expirationTimestamp,
- _msgSender()
+ msg.sender
  );
  }
 
@@ -112,11 +112,11 @@ abstract contract RequesterAuthorizer is IRequesterAuthorizer {
  status &&
  !airnodeToRequesterToSetterToIndefiniteAuthorizationStatus[airnode][
  requester
- ][_msgSender()]
+ ][msg.sender]
  ) {
  airnodeToRequesterToSetterToIndefiniteAuthorizationStatus[airnode][
  requester
- ][_msgSender()] = true;
+ ][msg.sender] = true;
  unchecked {
  indefiniteAuthorizationCount++;
  }
@@ -126,11 +126,11 @@ abstract contract RequesterAuthorizer is IRequesterAuthorizer {
  !status &&
  airnodeToRequesterToSetterToIndefiniteAuthorizationStatus[airnode][
  requester
- ][_msgSender()]
+ ][msg.sender]
  ) {
  airnodeToRequesterToSetterToIndefiniteAuthorizationStatus[airnode][
  requester
- ][_msgSender()] = false;
+ ][msg.sender] = false;
  unchecked {
  indefiniteAuthorizationCount--;
  }
@@ -142,7 +142,7 @@ abstract contract RequesterAuthorizer is IRequesterAuthorizer {
  requester,
  status,
  indefiniteAuthorizationCount,
- _msgSender()
+ msg.sender
  );
  }
 
@@ -181,7 +181,7 @@ abstract contract RequesterAuthorizer is IRequesterAuthorizer {
  requester,
  setter,
  indefiniteAuthorizationCount,
- _msgSender()
+ msg.sender
  );
  }
  }
@@ -203,7 +203,4 @@ abstract contract RequesterAuthorizer is IRequesterAuthorizer {
  authorizationStatus.indefiniteAuthorizationCount > 0 ||
  authorizationStatus.expirationTimestamp > block.timestamp;
  }
-
- /// @dev See Context.sol
- function _msgSender() internal view virtual returns (address sender);
 }

contracts/authorizers/RequesterAuthorizerWithAirnode.sol

@@ -1,15 +1,13 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.17;
 
-import "@openzeppelin/contracts/metatx/ERC2771Context.sol";
 import "../access-control-registry/AccessControlRegistryAdminned.sol";
 import "./RequesterAuthorizer.sol";
 import "./interfaces/IRequesterAuthorizerWithAirnode.sol";
 
 /// @title Authorizer contract that Airnode operators can use to temporarily or
 /// indefinitely authorize requesters for the respective Airnodes
 contract RequesterAuthorizerWithAirnode is
- ERC2771Context,
  AccessControlRegistryAdminned,
  RequesterAuthorizer,
  IRequesterAuthorizerWithAirnode
@@ -35,7 +33,6 @@ contract RequesterAuthorizerWithAirnode is
  address _accessControlRegistry,
  string memory _adminRoleDescription
  )
- ERC2771Context(_accessControlRegistry)
  AccessControlRegistryAdminned(
  _accessControlRegistry,
  _adminRoleDescription
@@ -57,7 +54,7 @@ contract RequesterAuthorizerWithAirnode is
  require(
  hasAuthorizationExpirationExtenderRoleOrIsAirnode(
  airnode,
- _msgSender()
+ msg.sender
  ),
  "Cannot extend expiration"
  );
@@ -79,7 +76,7 @@ contract RequesterAuthorizerWithAirnode is
  require(
  hasAuthorizationExpirationSetterRoleOrIsAirnode(
  airnode,
- _msgSender()
+ msg.sender
  ),
  "Cannot set expiration"
  );
@@ -97,7 +94,7 @@ contract RequesterAuthorizerWithAirnode is
  bool status
  ) external override {
  require(
- hasIndefiniteAuthorizerRoleOrIsAirnode(airnode, _msgSender()),
+ hasIndefiniteAuthorizerRoleOrIsAirnode(airnode, msg.sender),
  "Cannot set indefinite status"
  );
  _setIndefiniteAuthorizationStatus(airnode, requester, status);
@@ -227,15 +224,4 @@ contract RequesterAuthorizerWithAirnode is
  account
  );
  }
-
- /// @dev See Context.sol
- function _msgSender()
- internal
- view
- virtual
- override(RequesterAuthorizer, ERC2771Context)
- returns (address)
- {
- return ERC2771Context._msgSender();
- }
 }