Add gasless support to airdrop contracts (#436)

* add gasless support to airdrop contracts

* docs

* v3.6.2

Author: kumaryash90

contracts/airdrop/AirdropERC1155.sol

@@ -21,14 +21,18 @@ import "@openzeppelin/contracts-upgradeable/utils/MulticallUpgradeable.sol";
 //  ==========  Internal imports    ==========
 
 import "../interfaces/airdrop/IAirdropERC1155.sol";
+import "../openzeppelin-presets/metatx/ERC2771ContextUpgradeable.sol";
 
 //  ==========  Features    ==========
 import "../extension/PermissionsEnumerable.sol";
+import "../extension/ContractMetadata.sol";
 
 contract AirdropERC1155 is
     Initializable,
+    ContractMetadata,
     PermissionsEnumerable,
     ReentrancyGuardUpgradeable,
+    ERC2771ContextUpgradeable,
     MulticallUpgradeable,
     IAirdropERC1155
 {
@@ -46,7 +50,14 @@ contract AirdropERC1155 is
     constructor() initializer {}
 
     /// @dev Initiliazes the contract, like a constructor.
-    function initialize(address _defaultAdmin) external initializer {
+    function initialize(
+        address _defaultAdmin,
+        string memory _contractURI,
+        address[] memory _trustedForwarders
+    ) external initializer {
+        __ERC2771Context_init_unchained(_trustedForwarders);
+
+        _setupContractURI(_contractURI);
         _setupRole(DEFAULT_ADMIN_ROLE, _defaultAdmin);
         __ReentrancyGuard_init();
     }
@@ -82,7 +93,9 @@ contract AirdropERC1155 is
         address _tokenAddress,
         address _tokenOwner,
         AirdropContent[] calldata _contents
-    ) external nonReentrant onlyRole(DEFAULT_ADMIN_ROLE) {
+    ) external nonReentrant {
+        require(hasRole(DEFAULT_ADMIN_ROLE, _msgSender()), "Not authorized.");
+
         uint256 len = _contents.length;
 
         for (uint256 i = 0; i < len; ) {
@@ -116,4 +129,23 @@ contract AirdropERC1155 is
             }
         }
     }
+
+    /*///////////////////////////////////////////////////////////////
+                        Miscellaneous
+    //////////////////////////////////////////////////////////////*/
+
+    /// @dev Checks whether contract metadata can be set in the given execution context.
+    function _canSetContractURI() internal view override returns (bool) {
+        return hasRole(DEFAULT_ADMIN_ROLE, _msgSender());
+    }
+
+    /// @dev See ERC2771
+    function _msgSender() internal view virtual override returns (address sender) {
+        return ERC2771ContextUpgradeable._msgSender();
+    }
+
+    /// @dev See ERC2771
+    function _msgData() internal view virtual override returns (bytes calldata) {
+        return ERC2771ContextUpgradeable._msgData();
+    }
 }

contracts/airdrop/AirdropERC20.sol

@@ -22,14 +22,18 @@ import "@openzeppelin/contracts-upgradeable/utils/MulticallUpgradeable.sol";
 import "../interfaces/airdrop/IAirdropERC20.sol";
 import { CurrencyTransferLib } from "../lib/CurrencyTransferLib.sol";
 import "../eip/interface/IERC20.sol";
+import "../openzeppelin-presets/metatx/ERC2771ContextUpgradeable.sol";
 
 //  ==========  Features    ==========
 import "../extension/PermissionsEnumerable.sol";
+import "../extension/ContractMetadata.sol";
 
 contract AirdropERC20 is
     Initializable,
+    ContractMetadata,
     PermissionsEnumerable,
     ReentrancyGuardUpgradeable,
+    ERC2771ContextUpgradeable,
     MulticallUpgradeable,
     IAirdropERC20
 {
@@ -47,7 +51,14 @@ contract AirdropERC20 is
     constructor() initializer {}
 
     /// @dev Initiliazes the contract, like a constructor.
-    function initialize(address _defaultAdmin) external initializer {
+    function initialize(
+        address _defaultAdmin,
+        string memory _contractURI,
+        address[] memory _trustedForwarders
+    ) external initializer {
+        __ERC2771Context_init_unchained(_trustedForwarders);
+
+        _setupContractURI(_contractURI);
         _setupRole(DEFAULT_ADMIN_ROLE, _defaultAdmin);
         __ReentrancyGuard_init();
     }
@@ -83,7 +94,9 @@ contract AirdropERC20 is
         address _tokenAddress,
         address _tokenOwner,
         AirdropContent[] calldata _contents
-    ) external payable nonReentrant onlyRole(DEFAULT_ADMIN_ROLE) {
+    ) external payable nonReentrant {
+        require(hasRole(DEFAULT_ADMIN_ROLE, _msgSender()), "Not authorized.");
+
         uint256 len = _contents.length;
         uint256 nativeTokenAmount;
         uint256 refundAmount;
@@ -160,4 +173,19 @@ contract AirdropERC20 is
             }
         }
     }
+
+    /// @dev Checks whether contract metadata can be set in the given execution context.
+    function _canSetContractURI() internal view override returns (bool) {
+        return hasRole(DEFAULT_ADMIN_ROLE, _msgSender());
+    }
+
+    /// @dev See ERC2771
+    function _msgSender() internal view virtual override returns (address sender) {
+        return ERC2771ContextUpgradeable._msgSender();
+    }
+
+    /// @dev See ERC2771
+    function _msgData() internal view virtual override returns (bytes calldata) {
+        return ERC2771ContextUpgradeable._msgData();
+    }
 }

contracts/airdrop/AirdropERC721.sol

@@ -21,14 +21,18 @@ import "@openzeppelin/contracts-upgradeable/utils/MulticallUpgradeable.sol";
 //  ==========  Internal imports    ==========
 
 import "../interfaces/airdrop/IAirdropERC721.sol";
+import "../openzeppelin-presets/metatx/ERC2771ContextUpgradeable.sol";
 
 //  ==========  Features    ==========
 import "../extension/PermissionsEnumerable.sol";
+import "../extension/ContractMetadata.sol";
 
 contract AirdropERC721 is
     Initializable,
+    ContractMetadata,
     PermissionsEnumerable,
     ReentrancyGuardUpgradeable,
+    ERC2771ContextUpgradeable,
     MulticallUpgradeable,
     IAirdropERC721
 {
@@ -46,7 +50,14 @@ contract AirdropERC721 is
     constructor() initializer {}
 
     /// @dev Initiliazes the contract, like a constructor.
-    function initialize(address _defaultAdmin) external initializer {
+    function initialize(
+        address _defaultAdmin,
+        string memory _contractURI,
+        address[] memory _trustedForwarders
+    ) external initializer {
+        __ERC2771Context_init_unchained(_trustedForwarders);
+
+        _setupContractURI(_contractURI);
         _setupRole(DEFAULT_ADMIN_ROLE, _defaultAdmin);
         __ReentrancyGuard_init();
     }
@@ -82,7 +93,9 @@ contract AirdropERC721 is
         address _tokenAddress,
         address _tokenOwner,
         AirdropContent[] calldata _contents
-    ) external nonReentrant onlyRole(DEFAULT_ADMIN_ROLE) {
+    ) external nonReentrant {
+        require(hasRole(DEFAULT_ADMIN_ROLE, _msgSender()), "Not authorized.");
+
         uint256 len = _contents.length;
 
         for (uint256 i = 0; i < len; ) {
@@ -109,4 +122,23 @@ contract AirdropERC721 is
             }
         }
     }
+
+    /*///////////////////////////////////////////////////////////////
+                        Miscellaneous
+    //////////////////////////////////////////////////////////////*/
+
+    /// @dev Checks whether contract metadata can be set in the given execution context.
+    function _canSetContractURI() internal view override returns (bool) {
+        return hasRole(DEFAULT_ADMIN_ROLE, _msgSender());
+    }
+
+    /// @dev See ERC2771
+    function _msgSender() internal view virtual override returns (address sender) {
+        return ERC2771ContextUpgradeable._msgSender();
+    }
+
+    /// @dev See ERC2771
+    function _msgData() internal view virtual override returns (bytes calldata) {
+        return ERC2771ContextUpgradeable._msgData();
+    }
 }

contracts/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@thirdweb-dev/contracts",
   "description": "Collection of smart contracts deployable via the thirdweb SDK, dashboard and CLI",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",

docs/AirdropERC1155.md

@@ -62,6 +62,23 @@ function contractType() external pure returns (bytes32)
 |---|---|---|
 | _0 | bytes32 | undefined |
 
+### contractURI
+
+```solidity
+function contractURI() external view returns (string)
+```
+
+Returns the contract metadata URI.
+
+
+
+
+#### Returns
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | string | undefined |
+
 ### contractVersion
 
 ```solidity
@@ -212,7 +229,7 @@ Checks whether an account has a particular role;                  role restricti
 ### initialize
 
 ```solidity
-function initialize(address _defaultAdmin) external nonpayable
+function initialize(address _defaultAdmin, string _contractURI, address[] _trustedForwarders) external nonpayable
 ```
 
 
@@ -224,6 +241,30 @@ function initialize(address _defaultAdmin) external nonpayable
 | Name | Type | Description |
 |---|---|---|
 | _defaultAdmin | address | undefined |
+| _contractURI | string | undefined |
+| _trustedForwarders | address[] | undefined |
+
+### isTrustedForwarder
+
+```solidity
+function isTrustedForwarder(address forwarder) external view returns (bool)
+```
+
+
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| forwarder | address | undefined |
+
+#### Returns
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | bool | undefined |
 
 ### multicall
 
@@ -281,6 +322,22 @@ Revokes role from an account.
 | role | bytes32 | keccak256 hash of the role. e.g. keccak256("TRANSFER_ROLE") |
 | account | address | Address of the account from which the role is being revoked. |
 
+### setContractURI
+
+```solidity
+function setContractURI(string _uri) external nonpayable
+```
+
+Lets a contract admin set the URI for contract-level metadata.
+
+*Caller should be authorized to setup contractURI, e.g. contract admin.                  See {_canSetContractURI}.                  Emits {ContractURIUpdated Event}.*
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| _uri | string | keccak256 hash of the role. e.g. keccak256("TRANSFER_ROLE") |
+
 
 
 ## Events
@@ -305,6 +362,23 @@ Emitted when an airdrop fails for a recipient address.
 | tokenId  | uint256 | undefined |
 | amount  | uint256 | undefined |
 
+### ContractURIUpdated
+
+```solidity
+event ContractURIUpdated(string prevURI, string newURI)
+```
+
+
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| prevURI  | string | undefined |
+| newURI  | string | undefined |
+
 ### Initialized
 
 ```solidity