Skip to content

Commit 3f1c169

Browse files
Krishang NadgaudaKrishang Nadgauda
Krishang Nadgauda
authored and
Krishang Nadgauda
committed
Emit TokensMintedWithSignature instead of TokensMinted
1 parent 57fa8e7 commit 3f1c169

File tree

8 files changed

+153
-29
lines changed

8 files changed

+153
-29
lines changed

‎contracts/feature/interface/ISignatureMintERC721.sol‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,12 @@ interface ISignatureMintERC721 {
3939
}
4040

4141
/// @dev Emitted when tokens are minted.
42-
// event TokensMintedWithSignature(address indexed signer, address indexed mintedTo, MintRequest mintRequest);
42+
event TokensMintedWithSignature(
43+
address indexed signer,
44+
address indexed mintedTo,
45+
uint256 indexed tokenIdMinted,
46+
MintRequest mintRequest
47+
);
4348

4449
/**
4550
* @notice Verifies that a mint request is signed by an account holding
@@ -61,5 +66,5 @@ interface ISignatureMintERC721 {
6166
* @param req The payload / mint request.
6267
* @param signature The signature produced by an account signing the mint request.
6368
*/
64-
function mintWithSignature(MintRequest calldata req, bytes calldata signature) external payable;
69+
function mintWithSignature(MintRequest calldata req, bytes calldata signature) external payable returns(address signer);
6570
}

‎contracts/signature-drop/SigMint.sol‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,18 @@ contract SigMint is SignatureMintERC721 {
1212
//////////////////////////////////////////////////////////////*/
1313

1414
/// @dev Claim lazy minted tokens via signature.
15-
function mintWithSignature(MintRequest calldata _req, bytes calldata _signature) external payable {
15+
function mintWithSignature(
16+
MintRequest calldata _req,
17+
bytes calldata _signature
18+
)
19+
external
20+
payable
21+
returns (address signer)
22+
{
1623
require(_req.quantity > 0, "minting zero tokens");
1724

1825
// Verify and process payload.
19-
// address signer = _processRequest(_req, _signature);
20-
_processRequest(_req, _signature);
21-
22-
// emit TokensMintedWithSignature(signer, _req.to, _req);
26+
signer = _processRequest(_req, _signature);
2327
}
2428

2529
/*///////////////////////////////////////////////////////////////

‎contracts/signature-drop/SignatureDrop.sol‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,11 @@ contract SignatureDrop is
7676

7777
event TokensLazyMinted(uint256 startTokenId, uint256 endTokenId, string baseURI, bytes encryptedBaseURI);
7878
event TokenURIRevealed(uint256 index, string revealedURI);
79-
event TokensMinted(
80-
address indexed minter,
81-
address receiver,
82-
uint256 indexed startTokenId,
83-
uint256 amountMinted,
84-
uint256 pricePerToken,
85-
address indexed currency
79+
event TokensMintedWithSignature(
80+
address indexed signer,
81+
address indexed mintedTo,
82+
uint256 indexed tokenIdMinted,
83+
ISignatureMintERC721.MintRequest mintRequest
8684
);
8785

8886
/*///////////////////////////////////////////////////////////////
@@ -211,8 +209,9 @@ contract SignatureDrop is
211209
external
212210
payable
213211
nonReentrant
212+
returns (address signer)
214213
{
215-
ISignatureMintERC721(sigMint).mintWithSignature(_req, _signature);
214+
signer = ISignatureMintERC721(sigMint).mintWithSignature(_req, _signature);
216215

217216
uint256 tokenIdToMint = _currentIndex;
218217
require(tokenIdToMint + _req.quantity <= nextTokenIdToMint, "not enough minted tokens.");
@@ -226,7 +225,7 @@ contract SignatureDrop is
226225
// Mint tokens.
227226
_mint(receiver, _req.quantity);
228227

229-
emit TokensMinted(_msgSender(), _req.to, tokenIdToMint, _req.quantity, _req.pricePerToken, _req.currency);
228+
emit TokensMintedWithSignature(signer, receiver, tokenIdToMint, _req);
230229
}
231230

232231
/// @dev Lets an account claim tokens.

‎docs/ISignatureMintERC721.md‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ The &#39;signature minting&#39; mechanism used in thirdweb Token smart contracts
1313
### mintWithSignature
1414

1515
```solidity
16-
function mintWithSignature(ISignatureMintERC721.MintRequest req, bytes signature) external payable
16+
function mintWithSignature(ISignatureMintERC721.MintRequest req, bytes signature) external payable returns (address signer)
1717
```
1818

1919
Mints tokens according to the provided mint request.
@@ -27,6 +27,12 @@ Mints tokens according to the provided mint request.
2727
| req | ISignatureMintERC721.MintRequest | The payload / mint request.
2828
| signature | bytes | The signature produced by an account signing the mint request.
2929

30+
#### Returns
31+
32+
| Name | Type | Description |
33+
|---|---|---|
34+
| signer | address | undefined
35+
3036
### verify
3137

3238
```solidity
@@ -53,4 +59,26 @@ Verifies that a mint request is signed by an account holding MINTER_ROL
5359

5460

5561

62+
## Events
63+
64+
### TokensMintedWithSignature
65+
66+
```solidity
67+
event TokensMintedWithSignature(address indexed signer, address indexed mintedTo, uint256 indexed tokenIdMinted, ISignatureMintERC721.MintRequest mintRequest)
68+
```
69+
70+
71+
72+
*Emitted when tokens are minted.*
73+
74+
#### Parameters
75+
76+
| Name | Type | Description |
77+
|---|---|---|
78+
| signer `indexed` | address | undefined |
79+
| mintedTo `indexed` | address | undefined |
80+
| tokenIdMinted `indexed` | uint256 | undefined |
81+
| mintRequest | ISignatureMintERC721.MintRequest | undefined |
82+
83+
5684

‎docs/SigMint.md‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
### mintWithSignature
1414

1515
```solidity
16-
function mintWithSignature(ISignatureMintERC721.MintRequest _req, bytes _signature) external payable
16+
function mintWithSignature(ISignatureMintERC721.MintRequest _req, bytes _signature) external payable returns (address signer)
1717
```
1818

1919

@@ -27,6 +27,12 @@ function mintWithSignature(ISignatureMintERC721.MintRequest _req, bytes _signatu
2727
| _req | ISignatureMintERC721.MintRequest | undefined
2828
| _signature | bytes | undefined
2929

30+
#### Returns
31+
32+
| Name | Type | Description |
33+
|---|---|---|
34+
| signer | address | undefined
35+
3036
### verify
3137

3238
```solidity
@@ -53,4 +59,26 @@ function verify(ISignatureMintERC721.MintRequest _req, bytes _signature) externa
5359

5460

5561

62+
## Events
63+
64+
### TokensMintedWithSignature
65+
66+
```solidity
67+
event TokensMintedWithSignature(address indexed signer, address indexed mintedTo, uint256 indexed tokenIdMinted, ISignatureMintERC721.MintRequest mintRequest)
68+
```
69+
70+
71+
72+
73+
74+
#### Parameters
75+
76+
| Name | Type | Description |
77+
|---|---|---|
78+
| signer `indexed` | address | undefined |
79+
| mintedTo `indexed` | address | undefined |
80+
| tokenIdMinted `indexed` | uint256 | undefined |
81+
| mintRequest | ISignatureMintERC721.MintRequest | undefined |
82+
83+
5684

‎docs/SignatureDrop.md‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ function lazyMint(uint256 _amount, string _baseURIForTokens, bytes _encryptedBas
673673
### mintWithSignature
674674

675675
```solidity
676-
function mintWithSignature(ISignatureMintERC721.MintRequest _req, bytes _signature) external payable
676+
function mintWithSignature(ISignatureMintERC721.MintRequest _req, bytes _signature) external payable returns (address signer)
677677
```
678678

679679

@@ -687,6 +687,12 @@ function mintWithSignature(ISignatureMintERC721.MintRequest _req, bytes _signatu
687687
| _req | ISignatureMintERC721.MintRequest | undefined
688688
| _signature | bytes | undefined
689689

690+
#### Returns
691+
692+
| Name | Type | Description |
693+
|---|---|---|
694+
| signer | address | undefined
695+
690696
### multicall
691697

692698
```solidity
@@ -1486,10 +1492,10 @@ event TokensLazyMinted(uint256 startTokenId, uint256 endTokenId, string baseURI,
14861492
| baseURI | string | undefined |
14871493
| encryptedBaseURI | bytes | undefined |
14881494

1489-
### TokensMinted
1495+
### TokensMintedWithSignature
14901496

14911497
```solidity
1492-
event TokensMinted(address indexed minter, address receiver, uint256 indexed startTokenId, uint256 amountMinted, uint256 pricePerToken, address indexed currency)
1498+
event TokensMintedWithSignature(address indexed signer, address indexed mintedTo, uint256 indexed tokenIdMinted, ISignatureMintERC721.MintRequest mintRequest)
14931499
```
14941500

14951501

@@ -1500,12 +1506,10 @@ event TokensMinted(address indexed minter, address receiver, uint256 indexed sta
15001506

15011507
| Name | Type | Description |
15021508
|---|---|---|
1503-
| minter `indexed` | address | undefined |
1504-
| receiver | address | undefined |
1505-
| startTokenId `indexed` | uint256 | undefined |
1506-
| amountMinted | uint256 | undefined |
1507-
| pricePerToken | uint256 | undefined |
1508-
| currency `indexed` | address | undefined |
1509+
| signer `indexed` | address | undefined |
1510+
| mintedTo `indexed` | address | undefined |
1511+
| tokenIdMinted `indexed` | uint256 | undefined |
1512+
| mintRequest | ISignatureMintERC721.MintRequest | undefined |
15091513

15101514
### Transfer
15111515

‎docs/SignatureMintERC721.md‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
### mintWithSignature
1414

1515
```solidity
16-
function mintWithSignature(ISignatureMintERC721.MintRequest req, bytes signature) external payable
16+
function mintWithSignature(ISignatureMintERC721.MintRequest req, bytes signature) external payable returns (address signer)
1717
```
1818

1919
Mints tokens according to the provided mint request.
@@ -27,6 +27,12 @@ Mints tokens according to the provided mint request.
2727
| req | ISignatureMintERC721.MintRequest | The payload / mint request.
2828
| signature | bytes | The signature produced by an account signing the mint request.
2929

30+
#### Returns
31+
32+
| Name | Type | Description |
33+
|---|---|---|
34+
| signer | address | undefined
35+
3036
### verify
3137

3238
```solidity
@@ -53,4 +59,26 @@ function verify(ISignatureMintERC721.MintRequest _req, bytes _signature) externa
5359

5460

5561

62+
## Events
63+
64+
### TokensMintedWithSignature
65+
66+
```solidity
67+
event TokensMintedWithSignature(address indexed signer, address indexed mintedTo, uint256 indexed tokenIdMinted, ISignatureMintERC721.MintRequest mintRequest)
68+
```
69+
70+
71+
72+
73+
74+
#### Parameters
75+
76+
| Name | Type | Description |
77+
|---|---|---|
78+
| signer `indexed` | address | undefined |
79+
| mintedTo `indexed` | address | undefined |
80+
| tokenIdMinted `indexed` | uint256 | undefined |
81+
| mintRequest | ISignatureMintERC721.MintRequest | undefined |
82+
83+
5684

‎docs/SignatureMintERC721Upgradeable.md‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
### mintWithSignature
1414

1515
```solidity
16-
function mintWithSignature(ISignatureMintERC721.MintRequest req, bytes signature) external payable
16+
function mintWithSignature(ISignatureMintERC721.MintRequest req, bytes signature) external payable returns (address signer)
1717
```
1818

1919
Mints tokens according to the provided mint request.
@@ -27,6 +27,12 @@ Mints tokens according to the provided mint request.
2727
| req | ISignatureMintERC721.MintRequest | The payload / mint request.
2828
| signature | bytes | The signature produced by an account signing the mint request.
2929

30+
#### Returns
31+
32+
| Name | Type | Description |
33+
|---|---|---|
34+
| signer | address | undefined
35+
3036
### verify
3137

3238
```solidity
@@ -53,4 +59,26 @@ function verify(ISignatureMintERC721.MintRequest _req, bytes _signature) externa
5359

5460

5561

62+
## Events
63+
64+
### TokensMintedWithSignature
65+
66+
```solidity
67+
event TokensMintedWithSignature(address indexed signer, address indexed mintedTo, uint256 indexed tokenIdMinted, ISignatureMintERC721.MintRequest mintRequest)
68+
```
69+
70+
71+
72+
73+
74+
#### Parameters
75+
76+
| Name | Type | Description |
77+
|---|---|---|
78+
| signer `indexed` | address | undefined |
79+
| mintedTo `indexed` | address | undefined |
80+
| tokenIdMinted `indexed` | uint256 | undefined |
81+
| mintRequest | ISignatureMintERC721.MintRequest | undefined |
82+
83+
5684

0 commit comments

Comments
 (0)