Skip to content

Commit 4383f6a

Browse files
committed
feat: fix compatibility with latest change
1 parent ec2fd2e commit 4383f6a

File tree

1 file changed

+27
-13
lines changed

1 file changed

+27
-13
lines changed

src/badge/examples/ScrollEmployeeBadge.sol

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,34 @@ import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
99
import {ScrollBadge} from "../ScrollBadge.sol";
1010
import {ScrollBadgeAccessControl} from "../extensions/ScrollBadgeAccessControl.sol";
1111
import {ScrollBadgeCustomPayload} from "../extensions/ScrollBadgeCustomPayload.sol";
12+
import {ScrollBadgeDefaultURI} from "../extensions/ScrollBadgeDefaultURI.sol";
1213
import {ScrollBadgeNoExpiry} from "../extensions/ScrollBadgeNoExpiry.sol";
1314
import {ScrollBadgeNonRevocable} from "../extensions/ScrollBadgeNonRevocable.sol";
1415
import {ScrollBadgeSingleton} from "../extensions/ScrollBadgeSingleton.sol";
1516

16-
string constant SCROLL_EMPLOYEE_BADGE_SCHEMA = "uint256 employeeId,uint256 year";
17+
string constant SCROLL_EMPLOYEE_BADGE_SCHEMA = "uint256 year";
1718

18-
function decodePayloadData(bytes memory data) pure returns (uint256,uint256) {
19-
return abi.decode(data, (uint256,uint256));
19+
function decodePayloadData(bytes memory data) pure returns (uint256) {
20+
return abi.decode(data, (uint256));
2021
}
2122

2223
/// @title ScrollEmployeeBadge
2324
contract ScrollEmployeeBadge is
2425
ScrollBadgeAccessControl,
2526
ScrollBadgeCustomPayload,
27+
ScrollBadgeDefaultURI,
2628
ScrollBadgeNoExpiry,
2729
ScrollBadgeNonRevocable,
2830
ScrollBadgeSingleton
2931
{
3032
/// @notice The base token URI.
3133
string public baseTokenURI;
3234

33-
constructor(address resolver_, string memory baseTokenURI_) ScrollBadge(resolver_) {
35+
constructor(
36+
address resolver_,
37+
string memory baseTokenURI_,
38+
string memory defaultBadgeURI_
39+
) ScrollBadge(resolver_) ScrollBadgeDefaultURI(defaultBadgeURI_) {
3440
baseTokenURI = baseTokenURI_;
3541
}
3642

@@ -41,9 +47,12 @@ contract ScrollEmployeeBadge is
4147
}
4248

4349
/// @inheritdoc ScrollBadge
44-
function onIssueBadge(Attestation calldata attestation)
50+
function onIssueBadge(
51+
Attestation calldata attestation
52+
)
4553
internal
46-
override (
54+
override(
55+
ScrollBadge,
4756
ScrollBadgeAccessControl,
4857
ScrollBadgeCustomPayload,
4958
ScrollBadgeNoExpiry,
@@ -56,22 +65,27 @@ contract ScrollEmployeeBadge is
5665
}
5766

5867
/// @inheritdoc ScrollBadge
59-
function onRevokeBadge(Attestation calldata attestation)
68+
function onRevokeBadge(
69+
Attestation calldata attestation
70+
)
6071
internal
61-
override (
62-
ScrollBadge, ScrollBadgeAccessControl, ScrollBadgeCustomPayload, ScrollBadgeNoExpiry, ScrollBadgeSingleton
72+
override(
73+
ScrollBadge,
74+
ScrollBadgeAccessControl,
75+
ScrollBadgeCustomPayload,
76+
ScrollBadgeNoExpiry,
77+
ScrollBadgeSingleton
6378
)
6479
returns (bool)
6580
{
6681
return super.onRevokeBadge(attestation);
6782
}
6883

69-
/// @inheritdoc ScrollBadge
70-
/// @dev This function is TBD
71-
function badgeTokenURI(bytes32 uid) public view override returns (string memory) {
84+
/// @inheritdoc ScrollBadgeDefaultURI
85+
function getBadgeTokenURI(bytes32 uid) internal view override returns (string memory) {
7286
Attestation memory attestation = getAndValidateBadge(uid);
7387
bytes memory payload = getPayload(attestation);
74-
(,uint256 year) = decodePayloadData(payload);
88+
uint256 year = decodePayloadData(payload);
7589

7690
return string(abi.encodePacked(baseTokenURI, Strings.toString(year), ".json"));
7791
}

0 commit comments

Comments
 (0)