Skip to content

Commit 1eeab4e

Browse files
committed
naming and missing override
1 parent f7b29f5 commit 1eeab4e

File tree

3 files changed

+34
-20
lines changed

3 files changed

+34
-20
lines changed

src/Common.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ function decodeBadgeData(bytes memory data) pure returns (address, bytes memory)
1212

1313
function encodeBadgeData(address badge, bytes memory payload) pure returns (bytes memory) {
1414
return abi.encode(badge, payload);
15-
}
15+
}

src/badge/examples/SCRHoldingBadge.sol

Lines changed: 32 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,16 @@ contract SCRHoldingBadge is ScrollBadgeCustomPayload, ScrollBadgeDefaultURI, Own
2828
uint256 private constant LEVEL_TWO_SCR_AMOUNT = 10 ether;
2929
uint256 private constant LEVEL_THREE_SCR_AMOUNT = 100 ether;
3030
uint256 private constant LEVEL_FOUR_SCR_AMOUNT = 1000 ether;
31-
uint256 private constant LEVEL_FIVE_SCR_AMOUNT = 10000 ether;
32-
uint256 private constant LEVEL_SIX_SCR_AMOUNT = 100000 ether;
31+
uint256 private constant LEVEL_FIVE_SCR_AMOUNT = 10_000 ether;
32+
uint256 private constant LEVEL_SIX_SCR_AMOUNT = 100_000 ether;
3333

3434
/// @notice The address of SCR token.
3535
address public immutable scr;
3636

37-
constructor(
38-
address resolver_,
39-
string memory baseTokenURI_,
40-
address scr_
41-
) ScrollBadge(resolver_) ScrollBadgeDefaultURI(baseTokenURI_) {
37+
constructor(address resolver_, string memory baseTokenURI_, address scr_)
38+
ScrollBadge(resolver_)
39+
ScrollBadgeDefaultURI(baseTokenURI_)
40+
{
4241
scr = scr_;
4342
}
4443

@@ -49,33 +48,48 @@ contract SCRHoldingBadge is ScrollBadgeCustomPayload, ScrollBadgeDefaultURI, Own
4948
}
5049

5150
/// @inheritdoc ScrollBadge
52-
function onIssueBadge(
53-
Attestation calldata
54-
) internal virtual override(ScrollBadge, ScrollBadgeCustomPayload) returns (bool) {
51+
function onIssueBadge(Attestation calldata)
52+
internal
53+
virtual
54+
override (ScrollBadge, ScrollBadgeCustomPayload)
55+
returns (bool)
56+
{
5557
return false;
5658
}
5759

5860
/// @inheritdoc ScrollBadge
59-
function onRevokeBadge(
60-
Attestation calldata
61-
) internal virtual override(ScrollBadge, ScrollBadgeCustomPayload) returns (bool) {
61+
function onRevokeBadge(Attestation calldata)
62+
internal
63+
virtual
64+
override (ScrollBadge, ScrollBadgeCustomPayload)
65+
returns (bool)
66+
{
6267
return false;
6368
}
6469

6570
/// @inheritdoc ScrollBadge
66-
function badgeTokenURI(
67-
bytes32 uid
68-
) public view override(IScrollBadge, ScrollBadge, ScrollBadgeDefaultURI) returns (string memory) {
71+
function badgeTokenURI(bytes32 uid)
72+
public
73+
view
74+
override (IScrollBadge, ScrollBadge, ScrollBadgeDefaultURI)
75+
returns (string memory)
76+
{
6977
return ScrollBadgeDefaultURI.badgeTokenURI(uid);
7078
}
7179

80+
/// @inheritdoc IScrollBadge
81+
function hasBadge(address user) public view virtual override (IScrollBadge, ScrollBadge) returns (bool) {
82+
uint256 balance = IERC20(scr).balanceOf(user);
83+
return balance >= LEVEL_ONE_SCR_AMOUNT;
84+
}
85+
7286
/// @inheritdoc ScrollBadgeDefaultURI
7387
function getBadgeTokenURI(bytes32 uid) internal view override returns (string memory) {
7488
Attestation memory attestation = getAndValidateBadge(uid);
7589
bytes memory payload = getPayload(attestation);
76-
uint256 year = decodePayloadData(payload);
90+
uint256 level = decodePayloadData(payload);
7791

78-
return string(abi.encodePacked(defaultBadgeURI, Strings.toString(year), ".json"));
92+
return string(abi.encodePacked(defaultBadgeURI, Strings.toString(level), ".json"));
7993
}
8094

8195
/// @inheritdoc ScrollBadgeCustomPayload

src/badge/extensions/ScrollBadgeDefaultURI.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ abstract contract ScrollBadgeDefaultURI is ScrollBadge {
1414
}
1515

1616
/// @inheritdoc ScrollBadge
17-
function badgeTokenURI(bytes32 uid) public view override virtual returns (string memory) {
17+
function badgeTokenURI(bytes32 uid) public view virtual override returns (string memory) {
1818
if (uid == bytes32(0)) {
1919
return defaultBadgeURI;
2020
}

0 commit comments

Comments
 (0)