Skip to content

Commit 4d3913d

Browse files
jakeloojakeloo
committed
prettier
1 parent f6a00a2 commit 4d3913d

21 files changed

+130
-299
lines changed

‎contracts/AccessNFT.sol

+12-14
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ contract AccessNFT is
2222
Initializable,
2323
ERC2771ContextUpgradeable,
2424
MulticallUpgradeable,
25-
ERC1155PresetUpgradeable
25+
ERC1155PresetUpgradeable
2626
{
27-
2827
bytes32 private constant MODULE_TYPE = bytes32("AccessNFT");
2928
uint256 private constant VERSION = 1;
3029

@@ -39,7 +38,7 @@ contract AccessNFT is
3938

4039
/// @dev The thirdweb contract with fee related information.
4140
TWFee public immutable thirdwebFees;
42-
41+
4342
/// @dev Owner of the contract (purpose: OpenSea compatibility, etc.)
4443
address private _owner;
4544

@@ -179,7 +178,7 @@ contract AccessNFT is
179178
return VERSION;
180179
}
181180

182-
/// @dev See EIP 1155
181+
/// @dev See EIP 1155
183182
function uri(uint256 _nftId) public view override returns (string memory) {
184183
return tokenState[_nftId].uri;
185184
}
@@ -237,14 +236,11 @@ contract AccessNFT is
237236
/**
238237
* External functions.
239238
*/
240-
239+
241240
/// @dev Distributes accrued royalty and thirdweb fees to the relevant stakeholders.
242241
function withdrawFunds(address _currency) external {
243242
address recipient = royaltyRecipient;
244-
(address twFeeRecipient, uint256 twFeeBps) = thirdwebFees.getFeeInfo(
245-
address(this),
246-
TWFee.FeeType.Royalty
247-
);
243+
(address twFeeRecipient, uint256 twFeeBps) = thirdwebFees.getFeeInfo(address(this), TWFee.FeeType.Royalty);
248244

249245
uint256 totalTransferAmount = _currency == NATIVE_TOKEN
250246
? address(this).balance
@@ -265,10 +261,7 @@ contract AccessNFT is
265261
returns (address receiver, uint256 royaltyAmount)
266262
{
267263
receiver = address(this);
268-
(, uint256 royaltyFeeBps) = thirdwebFees.getFeeInfo(
269-
address(this),
270-
TWFee.FeeType.Transaction
271-
);
264+
(, uint256 royaltyFeeBps) = thirdwebFees.getFeeInfo(address(this), TWFee.FeeType.Transaction);
272265
if (royaltyBps > 0) {
273266
royaltyAmount = (salePrice * (royaltyBps + royaltyFeeBps)) / MAX_BPS;
274267
}
@@ -469,7 +462,12 @@ contract AccessNFT is
469462
}
470463

471464
/// @dev See EIP 165
472-
function supportsInterface(bytes4 interfaceId) public view override(ERC1155PresetUpgradeable, IERC165) returns (bool) {
465+
function supportsInterface(bytes4 interfaceId)
466+
public
467+
view
468+
override(ERC1155PresetUpgradeable, IERC165)
469+
returns (bool)
470+
{
473471
return super.supportsInterface(interfaceId) || type(IERC2981).interfaceId == interfaceId;
474472
}
475473
}

‎contracts/Bundle.sol

+10-18
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,7 @@ import "@openzeppelin/contracts/interfaces/IERC2981.sol";
2222
// Thirdweb top-level
2323
import "./TWFee.sol";
2424

25-
contract Bundle is
26-
IERC2981,
27-
Initializable,
28-
ERC2771ContextUpgradeable,
29-
MulticallUpgradeable,
30-
ERC1155PresetUpgradeable
31-
{
32-
25+
contract Bundle is IERC2981, Initializable, ERC2771ContextUpgradeable, MulticallUpgradeable, ERC1155PresetUpgradeable {
3326
bytes32 private constant MODULE_TYPE = bytes32("Bundle");
3427
uint256 private constant VERSION = 1;
3528

@@ -299,14 +292,11 @@ contract Bundle is
299292
/**
300293
* External functions
301294
*/
302-
295+
303296
/// @dev Distributes accrued royalty and thirdweb fees to the relevant stakeholders.
304297
function withdrawFunds(address _currency) external {
305298
address recipient = royaltyRecipient;
306-
(address twFeeRecipient, uint256 twFeeBps) = thirdwebFees.getFeeInfo(
307-
address(this),
308-
TWFee.FeeType.Royalty
309-
);
299+
(address twFeeRecipient, uint256 twFeeBps) = thirdwebFees.getFeeInfo(address(this), TWFee.FeeType.Royalty);
310300

311301
uint256 totalTransferAmount = _currency == NATIVE_TOKEN
312302
? address(this).balance
@@ -327,10 +317,7 @@ contract Bundle is
327317
returns (address receiver, uint256 royaltyAmount)
328318
{
329319
receiver = address(this);
330-
(, uint256 royaltyFeeBps) = thirdwebFees.getFeeInfo(
331-
address(this),
332-
TWFee.FeeType.Transaction
333-
);
320+
(, uint256 royaltyFeeBps) = thirdwebFees.getFeeInfo(address(this), TWFee.FeeType.Transaction);
334321
if (royaltyBps > 0) {
335322
royaltyAmount = (salePrice * (royaltyBps + royaltyFeeBps)) / MAX_BPS;
336323
}
@@ -534,7 +521,12 @@ contract Bundle is
534521
*/
535522

536523
/// @dev See EIP 165
537-
function supportsInterface(bytes4 interfaceId) public view override(ERC1155PresetUpgradeable, IERC165) returns (bool) {
524+
function supportsInterface(bytes4 interfaceId)
525+
public
526+
view
527+
override(ERC1155PresetUpgradeable, IERC165)
528+
returns (bool)
529+
{
538530
return super.supportsInterface(interfaceId) || type(IERC2981).interfaceId == interfaceId;
539531
}
540532

‎contracts/Pack.sol

+2-8
Original file line numberDiff line numberDiff line change
@@ -265,10 +265,7 @@ contract Pack is
265265
/// @dev Distributes accrued royalty and thirdweb fees to the relevant stakeholders.
266266
function withdrawFunds(address _currency) external {
267267
address recipient = royaltyRecipient;
268-
(address twFeeRecipient, uint256 twFeeBps) = thirdwebFees.getFeeInfo(
269-
address(this),
270-
TWFee.FeeType.Royalty
271-
);
268+
(address twFeeRecipient, uint256 twFeeBps) = thirdwebFees.getFeeInfo(address(this), TWFee.FeeType.Royalty);
272269

273270
uint256 totalTransferAmount = _currency == NATIVE_TOKEN
274271
? address(this).balance
@@ -289,10 +286,7 @@ contract Pack is
289286
returns (address receiver, uint256 royaltyAmount)
290287
{
291288
receiver = address(this);
292-
(, uint256 royaltyFeeBps) = thirdwebFees.getFeeInfo(
293-
address(this),
294-
TWFee.FeeType.Transaction
295-
);
289+
(, uint256 royaltyFeeBps) = thirdwebFees.getFeeInfo(address(this), TWFee.FeeType.Transaction);
296290
if (royaltyBps > 0) {
297291
royaltyAmount = (salePrice * (royaltyBps + royaltyFeeBps)) / MAX_BPS;
298292
}

‎contracts/Splits.sol

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ contract Splits is
2020
AccessControlEnumerableUpgradeable,
2121
PaymentSplitterUpgradeable
2222
{
23-
2423
bytes32 private constant MODULE_TYPE = bytes32("Splits");
2524
uint256 private constant VERSION = 1;
2625

‎contracts/TWFactory.sol

+3-18
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,7 @@ contract TWFactory is Multicall, ERC2771Context, AccessControlEnumerable {
5656
) public {
5757
require(implementationApproval[_implementation], "implementation not approved");
5858

59-
bytes memory proxyBytecode = abi.encodePacked(
60-
type(TWProxy).creationCode,
61-
abi.encode(_implementation, _data)
62-
);
59+
bytes memory proxyBytecode = abi.encodePacked(type(TWProxy).creationCode, abi.encode(_implementation, _data));
6360

6461
address deployedProxy = Create2.deploy(0, _salt, proxyBytecode);
6562

@@ -96,23 +93,11 @@ contract TWFactory is Multicall, ERC2771Context, AccessControlEnumerable {
9693
return modules[_moduleType][_version];
9794
}
9895

99-
function _msgSender()
100-
internal
101-
view
102-
virtual
103-
override(Context, ERC2771Context)
104-
returns (address sender)
105-
{
96+
function _msgSender() internal view virtual override(Context, ERC2771Context) returns (address sender) {
10697
return ERC2771Context._msgSender();
10798
}
10899

109-
function _msgData()
110-
internal
111-
view
112-
virtual
113-
override(Context, ERC2771Context)
114-
returns (bytes calldata)
115-
{
100+
function _msgData() internal view virtual override(Context, ERC2771Context) returns (bytes calldata) {
116101
return ERC2771Context._msgData();
117102
}
118103
}

‎contracts/TWFee.sol

+11-35
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ contract TWFee is Multicall, ERC2771Context, AccessControlEnumerable {
3838
event FeeInfoForModuleInstance(address indexed moduleInstance, FeeInfo feeInfo);
3939
event FeeInfoForModuleType(bytes32 indexed moduleType, FeeInfo feeInfo);
4040
event DefaultFeeInfo(FeeInfo feeInfo);
41-
41+
4242
modifier onlyValidFee(uint256 _feeBps) {
4343
require(_feeBps <= maxFeeBps, "fees too high");
4444
_;
@@ -56,10 +56,7 @@ contract TWFee is Multicall, ERC2771Context, AccessControlEnumerable {
5656
address _defaultTransactionFeeRecipient,
5757
uint128 _defaultRoyaltyFeeBps,
5858
uint128 _defaultTransactionFeeBps
59-
)
60-
ERC2771Context(_trustedForwarder)
61-
{
62-
59+
) ERC2771Context(_trustedForwarder) {
6360
defaultFeeInfo[FeeType.Royalty] = FeeInfo({
6461
bps: _defaultRoyaltyFeeBps,
6562
recipient: _defaultRoyaltyFeeRecipient
@@ -82,19 +79,19 @@ contract TWFee is Multicall, ERC2771Context, AccessControlEnumerable {
8279

8380
// Get appropriate fee bps
8481
bps = infoForModuleInstance.bps;
85-
if(bps == 0) {
82+
if (bps == 0) {
8683
bps = infoForModuleType.bps;
8784
}
88-
if(bps == 0) {
85+
if (bps == 0) {
8986
bps = defaults.bps;
9087
}
9188

9289
// Get appropriate fee recipient
9390
recipient = infoForModuleInstance.recipient;
94-
if(recipient == address(0)) {
91+
if (recipient == address(0)) {
9592
recipient = infoForModuleType.recipient;
9693
}
97-
if(recipient == address(0)) {
94+
if (recipient == address(0)) {
9895
recipient = defaults.recipient;
9996
}
10097
}
@@ -106,10 +103,7 @@ contract TWFee is Multicall, ERC2771Context, AccessControlEnumerable {
106103
address _feeRecipient,
107104
FeeType _feeType
108105
) external onlyModuleAdmin onlyValidFee(_feeBps) {
109-
FeeInfo memory feeInfo = FeeInfo({
110-
bps: _feeBps,
111-
recipient: _feeRecipient
112-
});
106+
FeeInfo memory feeInfo = FeeInfo({ bps: _feeBps, recipient: _feeRecipient });
113107

114108
feeInfoByModuleType[_moduleType][_feeType] = feeInfo;
115109

@@ -123,10 +117,7 @@ contract TWFee is Multicall, ERC2771Context, AccessControlEnumerable {
123117
address _feeRecipient,
124118
FeeType _feeType
125119
) external onlyModuleAdmin onlyValidFee(_feeBps) {
126-
FeeInfo memory feeInfo = FeeInfo({
127-
bps: _feeBps,
128-
recipient: _feeRecipient
129-
});
120+
FeeInfo memory feeInfo = FeeInfo({ bps: _feeBps, recipient: _feeRecipient });
130121

131122
feeInfoByModuleInstance[_module][_feeType] = feeInfo;
132123

@@ -139,33 +130,18 @@ contract TWFee is Multicall, ERC2771Context, AccessControlEnumerable {
139130
address _feeRecipient,
140131
FeeType _feeType
141132
) external onlyModuleAdmin onlyValidFee(_feeBps) {
142-
FeeInfo memory feeInfo = FeeInfo({
143-
bps: _feeBps,
144-
recipient: _feeRecipient
145-
});
133+
FeeInfo memory feeInfo = FeeInfo({ bps: _feeBps, recipient: _feeRecipient });
146134

147135
defaultFeeInfo[_feeType] = feeInfo;
148136

149137
emit DefaultFeeInfo(feeInfo);
150138
}
151139

152-
function _msgSender()
153-
internal
154-
view
155-
virtual
156-
override(Context, ERC2771Context)
157-
returns (address sender)
158-
{
140+
function _msgSender() internal view virtual override(Context, ERC2771Context) returns (address sender) {
159141
return ERC2771Context._msgSender();
160142
}
161143

162-
function _msgData()
163-
internal
164-
view
165-
virtual
166-
override(Context, ERC2771Context)
167-
returns (bytes calldata)
168-
{
144+
function _msgData() internal view virtual override(Context, ERC2771Context) returns (bytes calldata) {
169145
return ERC2771Context._msgData();
170146
}
171147
}

‎contracts/TWRegistry.sol

+6-26
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@ contract TWRegistry is Multicall, ERC2771Context, AccessControlEnumerable {
2525
_setupRole(FACTORY_ROLE, _thirdwebFactory);
2626
}
2727

28-
function addDeployment(
29-
address _moduleAddress,
30-
address _deployer
31-
) external {
28+
function addDeployment(address _moduleAddress, address _deployer) external {
3229
require(hasRole(FACTORY_ROLE, msg.sender) || msg.sender == _deployer, "not factory");
3330

3431
deployments[_deployer].totalDeployments += 1;
@@ -43,10 +40,9 @@ contract TWRegistry is Multicall, ERC2771Context, AccessControlEnumerable {
4340
function removeDeployment(address _moduleAddress) external {
4441
address deployer = _msgSender();
4542
uint256 moduleIdx = deployments[deployer].moduleIndex[_moduleAddress];
46-
43+
4744
require(moduleIdx != 0, "module does not exist");
4845

49-
5046
deployments[deployer].totalDeleted += 1;
5147

5248
delete deployments[deployer].moduleAddress[moduleIdx];
@@ -55,39 +51,23 @@ contract TWRegistry is Multicall, ERC2771Context, AccessControlEnumerable {
5551
emit ModuleDeleted(_moduleAddress, deployer);
5652
}
5753

58-
function getAllModules(address _deployer)
59-
external
60-
view
61-
returns (address[] memory allModules)
62-
{
54+
function getAllModules(address _deployer) external view returns (address[] memory allModules) {
6355
uint256 totalDeployments = deployments[_deployer].totalDeployments;
6456
uint256 numOfModules = totalDeployments - deployments[_deployer].totalDeleted;
6557
allModules = new address[](numOfModules);
6658

6759
for (uint256 i = 0; i < totalDeployments; i += 1) {
68-
if(deployments[_deployer].moduleAddress[i] != address(0)) {
60+
if (deployments[_deployer].moduleAddress[i] != address(0)) {
6961
allModules[i] = deployments[_deployer].moduleAddress[i];
7062
}
7163
}
7264
}
7365

74-
function _msgSender()
75-
internal
76-
view
77-
virtual
78-
override(Context, ERC2771Context)
79-
returns (address sender)
80-
{
66+
function _msgSender() internal view virtual override(Context, ERC2771Context) returns (address sender) {
8167
return ERC2771Context._msgSender();
8268
}
8369

84-
function _msgData()
85-
internal
86-
view
87-
virtual
88-
override(Context, ERC2771Context)
89-
returns (bytes calldata)
90-
{
70+
function _msgData() internal view virtual override(Context, ERC2771Context) returns (bytes calldata) {
9171
return ERC2771Context._msgData();
9272
}
9373
}

0 commit comments

Comments
 (0)