Skip to content
This repository was archived by the owner on Aug 20, 2025. It is now read-only.

Commit 970e2e4

Browse files
ryanioryanio
authored
Merge pull request #20 from ProjectOpenSea/ryan/updates
small updates
2 parents 51a13aa + b096439 commit 970e2e4

15 files changed

+58
-157
lines changed

‎lib/seadrop

‎script/DeployAndConfigure1155Receive.s.sol

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,7 @@ contract DeployAndConfigure1155Receive is Script, Test {
5252
recipient: payable(BURN_ADDRESS)
5353
});
5454

55-
CampaignRequirements[] memory requirements = new CampaignRequirements[](
56-
1
57-
);
55+
CampaignRequirements[] memory requirements = new CampaignRequirements[](1);
5856
requirements[0].offer = offer;
5957
requirements[0].consideration = consideration;
6058

‎script/DeployAndRedeemTokens-CampaignOnReceiveToken.s.sol

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ contract DeployAndRedeemTokens_CampaignOnReceiveToken is Script, Test {
3939
recipient: payable(BURN_ADDRESS)
4040
});
4141

42-
CampaignRequirements[] memory requirements = new CampaignRequirements[](
43-
1
44-
);
42+
CampaignRequirements[] memory requirements = new CampaignRequirements[](1);
4543
requirements[0].offer = offer;
4644
requirements[0].consideration = consideration;
4745

@@ -54,7 +52,7 @@ contract DeployAndRedeemTokens_CampaignOnReceiveToken is Script, Test {
5452
});
5553
Campaign memory campaign = Campaign({params: params, requirements: requirements});
5654
uint256 campaignId =
57-
receiveToken.createCampaign(campaign, "ipfs://QmbFxYgQMoBSUNFyW7WRWGaAWwJiRPM6HbK86aFkSJSq5N");
55+
receiveToken.createCampaign(campaign, "ipfs://Qmd1svWLxdjRUCxDCv6i6MFZtcU6SY56mD6JM8Ds1ZrXPB");
5856

5957
// Mint token 1 to redeem for token 1.
6058
redeemToken.mint(msg.sender, 1);
@@ -77,8 +75,8 @@ contract DeployAndRedeemTokens_CampaignOnReceiveToken is Script, Test {
7775
tokenIds[0] = 1;
7876

7977
// Individual user approvals not needed when setting the burn address.
80-
redeemToken.setApprovalForAll(address(receiveToken), true);
8178
// redeemToken.setBurnAddress(address(receiveToken));
79+
redeemToken.setApprovalForAll(address(receiveToken), true);
8280

8381
receiveToken.redeem(tokenIds, msg.sender, data);
8482

‎script/DeployAndRedeemTokens.s.sol

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,12 @@ contract DeployAndRedeemTokens is Script, Test {
1414
function run() external {
1515
vm.startBroadcast();
1616

17-
ERC721ShipyardRedeemableOwnerMintable redeemToken = new ERC721ShipyardRedeemableOwnerMintable(
18-
"TestRedeemablesRedeemToken",
19-
"TEST"
20-
);
17+
ERC721ShipyardRedeemableOwnerMintable redeemToken =
18+
new ERC721ShipyardRedeemableOwnerMintable("TestRedeemablesRedeemToken", "TEST");
2119
address[] memory redeemTokens = new address[](1);
2220
redeemTokens[0] = address(redeemToken);
23-
ERC721ShipyardRedeemableMintable receiveToken = new ERC721ShipyardRedeemableMintable(
24-
"TestRedeemablesRecieveToken",
25-
"TEST"
26-
);
21+
ERC721ShipyardRedeemableMintable receiveToken =
22+
new ERC721ShipyardRedeemableMintable("TestRedeemablesRecieveToken", "TEST");
2723
receiveToken.setRedeemablesContracts(redeemTokens);
2824

2925
// Configure the campaign.
@@ -46,9 +42,7 @@ contract DeployAndRedeemTokens is Script, Test {
4642
recipient: payable(BURN_ADDRESS)
4743
});
4844

49-
CampaignRequirements[] memory requirements = new CampaignRequirements[](
50-
1
51-
);
45+
CampaignRequirements[] memory requirements = new CampaignRequirements[](1);
5246
requirements[0].offer = offer;
5347
requirements[0].consideration = consideration;
5448

‎script/DeployAndRedeemTrait.s.sol

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,16 @@ contract DeployAndRedeemTrait is Script, Test {
1515
vm.startBroadcast();
1616

1717
// deploy the receive token first
18-
ERC721ShipyardRedeemableMintable receiveToken = new ERC721ShipyardRedeemableMintable(
19-
"TestRedeemablesRecieveToken",
20-
"TEST"
21-
);
18+
ERC721ShipyardRedeemableMintable receiveToken =
19+
new ERC721ShipyardRedeemableMintable("TestRedeemablesRecieveToken", "TEST");
2220

2321
// add the receive token address to allowed trait setters array
2422
address[] memory allowedTraitSetters = new address[](1);
2523
allowedTraitSetters[0] = address(receiveToken);
2624

2725
// deploy the redeem token
28-
ERC721ShipyardRedeemableTraitSetters redeemToken = new ERC721ShipyardRedeemableTraitSetters(
29-
"DynamicTraitsRedeemToken",
30-
"TEST"
31-
);
26+
ERC721ShipyardRedeemableTraitSetters redeemToken =
27+
new ERC721ShipyardRedeemableTraitSetters("DynamicTraitsRedeemToken", "TEST");
3228
// set the receive token as an allowed trait setter
3329
redeemToken.setAllowedTraitSetters(allowedTraitSetters);
3430

@@ -66,9 +62,7 @@ contract DeployAndRedeemTrait is Script, Test {
6662
substandardValue: substandardValue
6763
});
6864

69-
CampaignRequirements[] memory requirements = new CampaignRequirements[](
70-
1
71-
);
65+
CampaignRequirements[] memory requirements = new CampaignRequirements[](1);
7266
requirements[0].offer = offer;
7367
requirements[0].consideration = consideration;
7468
requirements[0].traitRedemptions = traitRedemptions;

‎script/DeployERC721ReceiveTokenWithPredeployedSeadropRedeemToken.s.sol

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ contract DeployERC721ReceiveTokenWithPredeployedSeaDropRedeemToken is Script, Te
3939
recipient: payable(BURN_ADDRESS)
4040
});
4141

42-
CampaignRequirements[] memory requirements = new CampaignRequirements[](
43-
1
44-
);
42+
CampaignRequirements[] memory requirements = new CampaignRequirements[](1);
4543
requirements[0].offer = offer;
4644
requirements[0].consideration = consideration;
4745

‎src/interfaces/IShipyardContractMetadata.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ interface IShipyardContractMetadata {
66
event BatchMetadataUpdate(uint256 _fromTokenId, uint256 _toTokenId);
77

88
/// @dev Emit an event when the URI for the collection-level metadata is updated.
9-
event ContractURIUpdated(string uri);
9+
event ContractURIUpdated();
1010

1111
/// @dev Emit an event when the provenance hash is updated.
1212
event ProvenanceHashUpdated(bytes32 oldProvenanceHash, bytes32 newProvenanceHash);

‎src/lib/ERC1155ShipyardContractMetadata.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ contract ERC1155ShipyardContractMetadata is
7373
contractURI = newURI;
7474

7575
// Emit an event with the update.
76-
emit ContractURIUpdated(newURI);
76+
emit ContractURIUpdated();
7777
}
7878

7979
/**

‎src/lib/ERC721ShipyardContractMetadata.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ contract ERC721ShipyardContractMetadata is
7373
contractURI = newURI;
7474

7575
// Emit an event with the update.
76-
emit ContractURIUpdated(newURI);
76+
emit ContractURIUpdated();
7777
}
7878

7979
/**

‎test/ERC7498-MultiRedeem.t.sol

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -36,35 +36,26 @@ contract ERC7498_MultiRedeem is BaseRedeemablesTest {
3636
address secondRedeemTokenAddress;
3737
_mintToken(address(context.erc7498Token), tokenId);
3838
if (_isERC721(address(context.erc7498Token))) {
39-
ERC721ShipyardRedeemableOwnerMintable secondRedeemToken721 = new ERC721ShipyardRedeemableOwnerMintable(
40-
"",
41-
""
42-
);
39+
ERC721ShipyardRedeemableOwnerMintable secondRedeemToken721 =
40+
new ERC721ShipyardRedeemableOwnerMintable("", "");
4341
secondRedeemTokenAddress = address(secondRedeemToken721);
4442
vm.label(secondRedeemTokenAddress, "secondRedeemToken721");
4543
secondRedeemToken721.setApprovalForAll(address(context.erc7498Token), true);
4644
} else {
47-
ERC1155ShipyardRedeemableOwnerMintable secondRedeemToken1155 = new ERC1155ShipyardRedeemableOwnerMintable(
48-
"",
49-
""
50-
);
45+
ERC1155ShipyardRedeemableOwnerMintable secondRedeemToken1155 =
46+
new ERC1155ShipyardRedeemableOwnerMintable("", "");
5147
secondRedeemTokenAddress = address(secondRedeemToken1155);
5248
vm.label(secondRedeemTokenAddress, "secondRedeemToken1155");
5349
secondRedeemToken1155.setApprovalForAll(address(context.erc7498Token), true);
5450
}
5551
_mintToken(secondRedeemTokenAddress, tokenId);
5652

57-
ERC721ShipyardRedeemableMintable receiveToken = new ERC721ShipyardRedeemableMintable(
58-
"",
59-
""
60-
);
53+
ERC721ShipyardRedeemableMintable receiveToken = new ERC721ShipyardRedeemableMintable("", "");
6154
receiveToken.setRedeemablesContracts(erc7498Tokens);
6255
ConsiderationItem[] memory consideration = new ConsiderationItem[](2);
6356
consideration[0] = _getCampaignConsiderationItem(address(context.erc7498Token));
6457
consideration[1] = _getCampaignConsiderationItem(secondRedeemTokenAddress);
65-
CampaignRequirements[] memory requirements = new CampaignRequirements[](
66-
1
67-
);
58+
CampaignRequirements[] memory requirements = new CampaignRequirements[](1);
6859
OfferItem[] memory offer = new OfferItem[](1);
6960
offer[0] = defaultCampaignOffer[0].withToken(address(receiveToken));
7061
requirements[0].offer = offer;
@@ -107,10 +98,7 @@ contract ERC7498_MultiRedeem is BaseRedeemablesTest {
10798

10899
function burnOneErc721OrErc1155RedeemMultiErc1155(RedeemablesContext memory context) public {
109100
_mintToken(address(context.erc7498Token), tokenId);
110-
ERC1155ShipyardRedeemableMintable receiveToken = new ERC1155ShipyardRedeemableMintable(
111-
"",
112-
""
113-
);
101+
ERC1155ShipyardRedeemableMintable receiveToken = new ERC1155ShipyardRedeemableMintable("", "");
114102
ERC721(address(context.erc7498Token)).setApprovalForAll(address(receiveToken), true);
115103
OfferItem[] memory offer = new OfferItem[](3);
116104
offer[0] = OfferItem({
@@ -136,9 +124,7 @@ contract ERC7498_MultiRedeem is BaseRedeemablesTest {
136124
});
137125
ConsiderationItem[] memory consideration = new ConsiderationItem[](1);
138126
consideration[0] = _getCampaignConsiderationItem(address(context.erc7498Token));
139-
CampaignRequirements[] memory requirements = new CampaignRequirements[](
140-
1
141-
);
127+
CampaignRequirements[] memory requirements = new CampaignRequirements[](1);
142128
requirements[0].offer = offer;
143129
requirements[0].consideration = consideration;
144130
CampaignParams memory params = CampaignParams({

0 commit comments

Comments
 (0)