Skip to content

Commit 5ecef13

Browse files
Krishang NadgaudaKrishang Nadgauda
authored andcommitted
inherit IThirdweb... in implementation, not interface
1 parent 1e93e60 commit 5ecef13

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

contracts/interfaces/IMultiwrap.sol

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
// SPDX-License-Identifier: Apache-2.0
22
pragma solidity ^0.8.11;
33

4-
import "./IThirdwebContract.sol";
5-
import "./IThirdwebRoyalty.sol";
6-
import "./IThirdwebOwnable.sol";
7-
84
/**
95
* Thirdweb's Multiwrap contract lets you wrap arbitrary ERC20, ERC721 and ERC1155
106
* tokens you own into a single wrapped token / NFT.
117
*
128
* A wrapped NFT can be unwrapped i.e. burned in exchange for its underlying contents.
139
*/
1410

15-
interface IMultiwrap is IThirdwebContract, IThirdwebOwnable, IThirdwebRoyalty {
11+
interface IMultiwrap {
1612
/// @notice The type of assets that can be wrapped.
1713
enum TokenType {
1814
ERC20,

contracts/multiwrap/Multiwrap.sol

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,26 @@ import "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.
1818

1919
// ========== Internal imports ==========
2020

21+
import "../interfaces/IThirdwebContract.sol";
22+
import "../interfaces/IThirdwebRoyalty.sol";
23+
import "../interfaces/IThirdwebOwnable.sol";
24+
2125
import "../interfaces/IMultiwrap.sol";
2226
import "../lib/CurrencyTransferLib.sol";
2327
import "../openzeppelin-presets/metatx/ERC2771ContextUpgradeable.sol";
2428

2529
contract Multiwrap is
26-
IMultiwrap,
30+
IThirdwebContract,
31+
IThirdwebOwnable,
32+
IThirdwebRoyalty,
2733
ReentrancyGuardUpgradeable,
2834
ERC2771ContextUpgradeable,
2935
MulticallUpgradeable,
3036
AccessControlEnumerableUpgradeable,
3137
ERC1155HolderUpgradeable,
3238
ERC721HolderUpgradeable,
33-
ERC721Upgradeable
39+
ERC721Upgradeable,
40+
IMultiwrap
3441
{
3542
/*///////////////////////////////////////////////////////////////
3643
State variables

lib/ds-test

lib/forge-std

0 commit comments

Comments
 (0)