Skip to content

Commit fb8c4b3

Browse files
Krishang NadgaudaKrishang Nadgauda
Krishang Nadgauda
authored and
Krishang Nadgauda
committed
pull from origin
2 parents a0007eb + ca6f06f commit fb8c4b3

25 files changed

+62
-62
lines changed

‎contracts/airdrop/AirdropERC1155Claimable.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,13 +141,13 @@ contract AirdropERC1155Claimable is
141141

142142
verifyClaim(claimer, _quantity, _tokenId, _proofs, _proofMaxQuantityForWallet);
143143

144-
transferClaimedTokens(_receiver, _quantity, _tokenId);
144+
_transferClaimedTokens(_receiver, _quantity, _tokenId);
145145

146146
emit TokensClaimed(_msgSender(), _receiver, _tokenId, _quantity);
147147
}
148148

149149
/// @dev Transfers the tokens being claimed.
150-
function transferClaimedTokens(
150+
function _transferClaimedTokens(
151151
address _to,
152152
uint256 _quantityBeingClaimed,
153153
uint256 _tokenId

‎contracts/airdrop/AirdropERC20Claimable.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ contract AirdropERC20Claimable is
124124

125125
verifyClaim(claimer, _quantity, _proofs, _proofMaxQuantityForWallet);
126126

127-
transferClaimedTokens(_receiver, _quantity);
127+
_transferClaimedTokens(_receiver, _quantity);
128128

129129
emit TokensClaimed(_msgSender(), _receiver, _quantity);
130130
}
@@ -158,7 +158,7 @@ contract AirdropERC20Claimable is
158158
}
159159

160160
/// @dev Transfers the tokens being claimed.
161-
function transferClaimedTokens(address _to, uint256 _quantityBeingClaimed) internal {
161+
function _transferClaimedTokens(address _to, uint256 _quantityBeingClaimed) internal {
162162
// if transfer claimed tokens is called when `to != msg.sender`, it'd use msg.sender's limits.
163163
// behavior would be similar to `msg.sender` mint for itself, then transfer to `_to`.
164164
supplyClaimedByWallet[_msgSender()] += _quantityBeingClaimed;

‎contracts/airdrop/AirdropERC721Claimable.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ contract AirdropERC721Claimable is
132132

133133
verifyClaim(claimer, _quantity, _proofs, _proofMaxQuantityForWallet);
134134

135-
transferClaimedTokens(_receiver, _quantity);
135+
_transferClaimedTokens(_receiver, _quantity);
136136

137137
emit TokensClaimed(_msgSender(), _receiver, _quantity);
138138
}
@@ -166,7 +166,7 @@ contract AirdropERC721Claimable is
166166
}
167167

168168
/// @dev Transfers the tokens being claimed.
169-
function transferClaimedTokens(address _to, uint256 _quantityBeingClaimed) internal {
169+
function _transferClaimedTokens(address _to, uint256 _quantityBeingClaimed) internal {
170170
// if transfer claimed tokens is called when `to != msg.sender`, it'd use msg.sender's limits.
171171
// behavior would be similar to `msg.sender` mint for itself, then transfer to `_to`.
172172
supplyClaimedByWallet[_msgSender()] += _quantityBeingClaimed;

‎contracts/base/ERC1155Base.sol‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ contract ERC1155Base is ERC1155, ContractMetadata, Ownable, Royalty, Multicall,
7373
return uriForToken;
7474
}
7575

76-
string memory batchUri = getBaseURI(_tokenId);
76+
string memory batchUri = _getBaseURI(_tokenId);
7777
return string(abi.encodePacked(batchUri, _tokenId.toString()));
7878
}
7979

‎contracts/base/ERC1155DelayedReveal.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ contract ERC1155DelayedReveal is ERC1155LazyMint, DelayedReveal {
4747
* @param _tokenId The tokenId of an NFT.
4848
*/
4949
function uri(uint256 _tokenId) public view override returns (string memory) {
50-
(uint256 batchId, ) = getBatchId(_tokenId);
51-
string memory batchUri = getBaseURI(_tokenId);
50+
(uint256 batchId, ) = _getBatchId(_tokenId);
51+
string memory batchUri = _getBaseURI(_tokenId);
5252

5353
if (isEncryptedBatch(batchId)) {
5454
return string(abi.encodePacked(batchUri, "0"));

‎contracts/base/ERC1155Drop.sol‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ contract ERC1155Drop is
9090
* @param _tokenId The tokenId of an NFT.
9191
*/
9292
function uri(uint256 _tokenId) public view virtual override returns (string memory) {
93-
(uint256 batchId, ) = getBatchId(_tokenId);
94-
string memory batchUri = getBaseURI(_tokenId);
93+
(uint256 batchId, ) = _getBatchId(_tokenId);
94+
string memory batchUri = _getBaseURI(_tokenId);
9595

9696
if (isEncryptedBatch(batchId)) {
9797
return string(abi.encodePacked(batchUri, "0"));
@@ -189,7 +189,7 @@ contract ERC1155Drop is
189189
}
190190

191191
/// @dev Collects and distributes the primary sale value of NFTs being claimed.
192-
function collectPriceOnClaim(
192+
function _collectPriceOnClaim(
193193
address _primarySaleRecipient,
194194
uint256 _quantityToClaim,
195195
address _currency,
@@ -212,7 +212,7 @@ contract ERC1155Drop is
212212
}
213213

214214
/// @dev Transfers the NFTs being claimed.
215-
function transferTokensOnClaim(
215+
function _transferTokensOnClaim(
216216
address _to,
217217
uint256 _tokenId,
218218
uint256 _quantityBeingClaimed

‎contracts/base/ERC1155LazyMint.sol‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ contract ERC1155LazyMint is
8989

9090
/// @notice Returns the metadata URI for the given tokenId.
9191
function uri(uint256 _tokenId) public view virtual override returns (string memory) {
92-
string memory batchUri = getBaseURI(_tokenId);
92+
string memory batchUri = _getBaseURI(_tokenId);
9393
return string(abi.encodePacked(batchUri, _tokenId.toString()));
9494
}
9595

@@ -121,7 +121,7 @@ contract ERC1155LazyMint is
121121
require(_tokenId < nextTokenIdToMint(), "invalid id");
122122
verifyClaim(msg.sender, _tokenId, _quantity); // Add your claim verification logic by overriding this function.
123123

124-
transferTokensOnClaim(_receiver, _tokenId, _quantity); // Mints tokens. Apply any state updates by overriding this function.
124+
_transferTokensOnClaim(_receiver, _tokenId, _quantity); // Mints tokens. Apply any state updates by overriding this function.
125125
emit TokensClaimed(msg.sender, _receiver, _tokenId, _quantity);
126126
}
127127

@@ -219,7 +219,7 @@ contract ERC1155LazyMint is
219219
* @dev Override this function to add logic for state updation.
220220
* When overriding, apply any state changes before `_mint`.
221221
*/
222-
function transferTokensOnClaim(
222+
function _transferTokensOnClaim(
223223
address _receiver,
224224
uint256 _tokenId,
225225
uint256 _quantity

‎contracts/base/ERC1155SignatureMint.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ contract ERC1155SignatureMint is ERC1155Base, PrimarySale, SignatureMintERC1155
7272
address receiver = _req.to;
7373

7474
// Collect price
75-
collectPriceOnClaim(_req.primarySaleRecipient, _req.quantity, _req.currency, _req.pricePerToken);
75+
_collectPriceOnClaim(_req.primarySaleRecipient, _req.quantity, _req.currency, _req.pricePerToken);
7676

7777
// Set royalties, if applicable.
7878
if (_req.royaltyRecipient != address(0)) {
@@ -105,7 +105,7 @@ contract ERC1155SignatureMint is ERC1155Base, PrimarySale, SignatureMintERC1155
105105
}
106106

107107
/// @dev Collects and distributes the primary sale value of NFTs being claimed.
108-
function collectPriceOnClaim(
108+
function _collectPriceOnClaim(
109109
address _primarySaleRecipient,
110110
uint256 _quantityToClaim,
111111
address _currency,

‎contracts/base/ERC20Drop.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ contract ERC20Drop is ContractMetadata, Multicall, Ownable, ERC20Permit, Primary
6565
//////////////////////////////////////////////////////////////*/
6666

6767
/// @dev Collects and distributes the primary sale value of tokens being claimed.
68-
function collectPriceOnClaim(
68+
function _collectPriceOnClaim(
6969
address _primarySaleRecipient,
7070
uint256 _quantityToClaim,
7171
address _currency,
@@ -87,7 +87,7 @@ contract ERC20Drop is ContractMetadata, Multicall, Ownable, ERC20Permit, Primary
8787
}
8888

8989
/// @dev Transfers the tokens being claimed.
90-
function transferTokensOnClaim(address _to, uint256 _quantityBeingClaimed)
90+
function _transferTokensOnClaim(address _to, uint256 _quantityBeingClaimed)
9191
internal
9292
virtual
9393
override

‎contracts/base/ERC20DropVote.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ contract ERC20DropVote is ContractMetadata, Multicall, Ownable, ERC20Votes, Prim
6565
//////////////////////////////////////////////////////////////*/
6666

6767
/// @dev Collects and distributes the primary sale value of tokens being claimed.
68-
function collectPriceOnClaim(
68+
function _collectPriceOnClaim(
6969
address _primarySaleRecipient,
7070
uint256 _quantityToClaim,
7171
address _currency,
@@ -87,7 +87,7 @@ contract ERC20DropVote is ContractMetadata, Multicall, Ownable, ERC20Votes, Prim
8787
}
8888

8989
/// @dev Transfers the tokens being claimed.
90-
function transferTokensOnClaim(address _to, uint256 _quantityBeingClaimed)
90+
function _transferTokensOnClaim(address _to, uint256 _quantityBeingClaimed)
9191
internal
9292
virtual
9393
override

0 commit comments

Comments
 (0)