@croptop/core-v6 0.0.49 → 0.0.50
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +8 -8
- package/remappings.txt +1 -0
- package/script/ConfigureFeeProject.s.sol +3 -3
- package/script/Deploy.s.sol +2 -2
- package/src/CTDeployer.sol +1 -1
- package/src/CTPublisher.sol +4 -4
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@croptop/core-v6",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.50",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -29,17 +29,17 @@
|
|
|
29
29
|
"artifacts": "source ./.env && npx sphinx artifacts --org-id 'ea165b21-7cdc-4d7b-be59-ecdd4c26bee4' --project-name 'croptop-core-v6'"
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@bananapus/721-hook-v6": "^0.0.
|
|
33
|
-
"@bananapus/core-v6": "^0.0.
|
|
34
|
-
"@bananapus/ownable-v6": "^0.0.
|
|
32
|
+
"@bananapus/721-hook-v6": "^0.0.52",
|
|
33
|
+
"@bananapus/core-v6": "^0.0.55",
|
|
34
|
+
"@bananapus/ownable-v6": "^0.0.26",
|
|
35
35
|
"@bananapus/permission-ids-v6": "^0.0.25",
|
|
36
|
-
"@bananapus/router-terminal-v6": "^0.0.
|
|
37
|
-
"@bananapus/suckers-v6": "^0.0.
|
|
36
|
+
"@bananapus/router-terminal-v6": "^0.0.45",
|
|
37
|
+
"@bananapus/suckers-v6": "^0.0.48",
|
|
38
38
|
"@openzeppelin/contracts": "5.6.1",
|
|
39
|
-
"@rev-net/core-v6": "^0.0.
|
|
39
|
+
"@rev-net/core-v6": "^0.0.58"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
|
-
"@bananapus/address-registry-v6": "^0.0.
|
|
42
|
+
"@bananapus/address-registry-v6": "^0.0.26",
|
|
43
43
|
"@sphinx-labs/plugins": "0.33.3"
|
|
44
44
|
}
|
|
45
45
|
}
|
package/remappings.txt
CHANGED
|
@@ -118,7 +118,7 @@ contract ConfigureFeeProjectScript is Script, Sphinx {
|
|
|
118
118
|
);
|
|
119
119
|
|
|
120
120
|
// We do a quick sanity check to make sure revnet and croptop use the same juicebox core contracts.
|
|
121
|
-
require(revnet.
|
|
121
|
+
require(revnet.basicDeployer.DIRECTORY() == croptop.publisher.DIRECTORY());
|
|
122
122
|
|
|
123
123
|
// Set the operator address to be the multisig.
|
|
124
124
|
operator = safeAddress();
|
|
@@ -338,10 +338,10 @@ contract ConfigureFeeProjectScript is Script, Sphinx {
|
|
|
338
338
|
// Only deploy if the project hasn't already been configured (restart-safe).
|
|
339
339
|
if (address(core.directory.controllerOf(feeProjectId)) == address(0)) {
|
|
340
340
|
// Approve the basic deployer to configure the project and transfer it.
|
|
341
|
-
core.projects.approve({to: address(revnet.
|
|
341
|
+
core.projects.approve({to: address(revnet.basicDeployer), tokenId: feeProjectId});
|
|
342
342
|
|
|
343
343
|
// Deploy the NANA fee project.
|
|
344
|
-
revnet.
|
|
344
|
+
revnet.basicDeployer
|
|
345
345
|
.deployFor({
|
|
346
346
|
revnetId: feeProjectId,
|
|
347
347
|
configuration: feeProjectConfig.configuration,
|
package/script/Deploy.s.sol
CHANGED
|
@@ -90,7 +90,7 @@ contract DeployScript is Script, Sphinx {
|
|
|
90
90
|
salt: _DEPLOYER_SALT,
|
|
91
91
|
creationCode: type(CTDeployer).creationCode,
|
|
92
92
|
arguments: abi.encode(
|
|
93
|
-
core.permissions, core.projects, hook.
|
|
93
|
+
core.permissions, core.projects, hook.hookDeployer, publisher, suckers.registry, trustedForwarder
|
|
94
94
|
)
|
|
95
95
|
});
|
|
96
96
|
|
|
@@ -99,7 +99,7 @@ contract DeployScript is Script, Sphinx {
|
|
|
99
99
|
? new CTDeployer{salt: _DEPLOYER_SALT}({
|
|
100
100
|
permissions: core.permissions,
|
|
101
101
|
projects: core.projects,
|
|
102
|
-
deployer: hook.
|
|
102
|
+
deployer: hook.hookDeployer,
|
|
103
103
|
publisher: publisher,
|
|
104
104
|
suckerRegistry: suckers.registry,
|
|
105
105
|
trustedForwarder: trustedForwarder
|
package/src/CTDeployer.sol
CHANGED
|
@@ -131,7 +131,7 @@ contract CTDeployer is ERC2771Context, JBPermissioned, IJBRulesetDataHook, IERC7
|
|
|
131
131
|
/// @param hook The hook to claim ownership of.
|
|
132
132
|
function claimCollectionOwnershipOf(IJB721TiersHook hook) external override {
|
|
133
133
|
// Get the project ID of the hook.
|
|
134
|
-
uint256 projectId = hook.
|
|
134
|
+
uint256 projectId = hook.projectId();
|
|
135
135
|
|
|
136
136
|
// Keep a reference to the caller.
|
|
137
137
|
address caller = _msgSender();
|
package/src/CTPublisher.sol
CHANGED
|
@@ -136,7 +136,7 @@ contract CTPublisher is JBPermissioned, ERC2771Context, ICTPublisher {
|
|
|
136
136
|
// Enforce permissions.
|
|
137
137
|
_requirePermissionFrom({
|
|
138
138
|
account: JBOwnable(allowedPost.hook).owner(),
|
|
139
|
-
projectId: IJB721TiersHook(allowedPost.hook).
|
|
139
|
+
projectId: IJB721TiersHook(allowedPost.hook).projectId(),
|
|
140
140
|
permissionId: JBPermissionIds.ADJUST_721_TIERS
|
|
141
141
|
});
|
|
142
142
|
|
|
@@ -214,7 +214,7 @@ contract CTPublisher is JBPermissioned, ERC2771Context, ICTPublisher {
|
|
|
214
214
|
bytes memory mintMetadata;
|
|
215
215
|
|
|
216
216
|
// Keep a reference to the project's ID.
|
|
217
|
-
uint256 projectId = hook.
|
|
217
|
+
uint256 projectId = hook.projectId();
|
|
218
218
|
|
|
219
219
|
{
|
|
220
220
|
// Setup the posts.
|
|
@@ -487,7 +487,7 @@ contract CTPublisher is JBPermissioned, ERC2771Context, ICTPublisher {
|
|
|
487
487
|
store.tierOf({hook: address(hook), id: tierId, includeResolvedUri: false});
|
|
488
488
|
if (
|
|
489
489
|
store.isTierRemoved({hook: address(hook), tierId: tierId})
|
|
490
|
-
|| cachedTier.
|
|
490
|
+
|| cachedTier.encodedIpfsUri != post.encodedIpfsUri
|
|
491
491
|
) {
|
|
492
492
|
delete tierIdForEncodedIpfsUriOf[address(hook)][post.encodedIpfsUri];
|
|
493
493
|
} else {
|
|
@@ -559,7 +559,7 @@ contract CTPublisher is JBPermissioned, ERC2771Context, ICTPublisher {
|
|
|
559
559
|
votingUnits: 0,
|
|
560
560
|
reserveFrequency: 0,
|
|
561
561
|
reserveBeneficiary: address(0),
|
|
562
|
-
|
|
562
|
+
encodedIpfsUri: post.encodedIpfsUri,
|
|
563
563
|
category: post.category,
|
|
564
564
|
discountPercent: 0,
|
|
565
565
|
flags: JB721TierConfigFlags({
|