@rev-net/core-v6 0.0.1 → 0.0.2
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
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rev-net/core-v6",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.2",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -18,8 +18,8 @@
|
|
|
18
18
|
"dependencies": {
|
|
19
19
|
"@bananapus/721-hook-v6": "^0.0.2",
|
|
20
20
|
"@bananapus/buyback-hook-v6": "^0.0.1",
|
|
21
|
-
"@bananapus/core-v6": "^0.0.
|
|
22
|
-
"@bananapus/permission-ids-v6": "^0.0.
|
|
21
|
+
"@bananapus/core-v6": "^0.0.4",
|
|
22
|
+
"@bananapus/permission-ids-v6": "^0.0.2",
|
|
23
23
|
"@bananapus/suckers-v6": "^0.0.1",
|
|
24
24
|
"@bananapus/swap-terminal-v6": "^0.0.2",
|
|
25
25
|
"@croptop/core-v6": "^0.0.3",
|
package/src/REVDeployer.sol
CHANGED
|
@@ -528,20 +528,19 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
|
|
|
528
528
|
uint256[] memory customSplitOperatorPermissionIndexes = _extraOperatorPermissions[revnetId];
|
|
529
529
|
|
|
530
530
|
// Make the array that merges the default and custom operator permissions.
|
|
531
|
-
allOperatorPermissions = new uint256[](
|
|
531
|
+
allOperatorPermissions = new uint256[](8 + customSplitOperatorPermissionIndexes.length);
|
|
532
532
|
allOperatorPermissions[0] = JBPermissionIds.SET_SPLIT_GROUPS;
|
|
533
533
|
allOperatorPermissions[1] = JBPermissionIds.SET_BUYBACK_POOL;
|
|
534
534
|
allOperatorPermissions[2] = JBPermissionIds.SET_BUYBACK_TWAP;
|
|
535
535
|
allOperatorPermissions[3] = JBPermissionIds.SET_PROJECT_URI;
|
|
536
536
|
allOperatorPermissions[4] = JBPermissionIds.ADD_PRICE_FEED;
|
|
537
537
|
allOperatorPermissions[5] = JBPermissionIds.SUCKER_SAFETY;
|
|
538
|
-
allOperatorPermissions[6] = JBPermissionIds.
|
|
539
|
-
allOperatorPermissions[7] = JBPermissionIds.
|
|
540
|
-
allOperatorPermissions[8] = JBPermissionIds.SET_SWAP_TERMINAL;
|
|
538
|
+
allOperatorPermissions[6] = JBPermissionIds.SET_BUYBACK_HOOK;
|
|
539
|
+
allOperatorPermissions[7] = JBPermissionIds.SET_ROUTER_TERMINAL;
|
|
541
540
|
|
|
542
541
|
// Copy the custom permissions into the array.
|
|
543
542
|
for (uint256 i; i < customSplitOperatorPermissionIndexes.length; i++) {
|
|
544
|
-
allOperatorPermissions[
|
|
543
|
+
allOperatorPermissions[8 + i] = customSplitOperatorPermissionIndexes[i];
|
|
545
544
|
}
|
|
546
545
|
}
|
|
547
546
|
|
|
@@ -28,9 +28,8 @@ import {JB721TiersHookStore} from "@bananapus/721-hook-v6/src/JB721TiersHookStor
|
|
|
28
28
|
import {JBAddressRegistry} from "@bananapus/address-registry-v6/src/JBAddressRegistry.sol";
|
|
29
29
|
import {IJBAddressRegistry} from "@bananapus/address-registry-v6/src/interfaces/IJBAddressRegistry.sol";
|
|
30
30
|
|
|
31
|
-
/// @notice Tests for
|
|
32
|
-
/// Verifies that
|
|
33
|
-
/// split operator permissions. The fix adds this as the 7th default permission.
|
|
31
|
+
/// @notice Tests for default operator permissions including SET_ROUTER_TERMINAL.
|
|
32
|
+
/// Verifies that all default split operator permissions are granted correctly.
|
|
34
33
|
contract TestPR29_SwapTerminalPermission is TestBaseWorkflow, JBTest {
|
|
35
34
|
bytes32 REV_DEPLOYER_SALT = "REVDeployer";
|
|
36
35
|
|
|
@@ -145,7 +144,7 @@ contract TestPR29_SwapTerminalPermission is TestBaseWorkflow, JBTest {
|
|
|
145
144
|
});
|
|
146
145
|
}
|
|
147
146
|
|
|
148
|
-
/// @notice Verify the split operator has SET_BUYBACK_HOOK and
|
|
147
|
+
/// @notice Verify the split operator has SET_BUYBACK_HOOK and SET_ROUTER_TERMINAL permissions.
|
|
149
148
|
function test_splitOperator_hasRegistryPermissions() public view {
|
|
150
149
|
bool hasBuybackHook = jbPermissions()
|
|
151
150
|
.hasPermission({
|
|
@@ -158,31 +157,30 @@ contract TestPR29_SwapTerminalPermission is TestBaseWorkflow, JBTest {
|
|
|
158
157
|
});
|
|
159
158
|
assertTrue(hasBuybackHook, "Split operator should have SET_BUYBACK_HOOK permission");
|
|
160
159
|
|
|
161
|
-
bool
|
|
160
|
+
bool hasRouterTerminal = jbPermissions()
|
|
162
161
|
.hasPermission({
|
|
163
162
|
operator: multisig(),
|
|
164
163
|
account: address(REV_DEPLOYER),
|
|
165
164
|
projectId: TEST_REVNET_ID,
|
|
166
|
-
permissionId: JBPermissionIds.
|
|
165
|
+
permissionId: JBPermissionIds.SET_ROUTER_TERMINAL,
|
|
167
166
|
includeRoot: false,
|
|
168
167
|
includeWildcardProjectId: false
|
|
169
168
|
});
|
|
170
|
-
assertTrue(
|
|
169
|
+
assertTrue(hasRouterTerminal, "Split operator should have SET_ROUTER_TERMINAL permission");
|
|
171
170
|
}
|
|
172
171
|
|
|
173
|
-
/// @notice Verify all
|
|
172
|
+
/// @notice Verify all 8 default permissions are present for the split operator.
|
|
174
173
|
function test_allDefaultPermissionsPresent() public view {
|
|
175
|
-
// All
|
|
176
|
-
uint256[
|
|
174
|
+
// All 8 default permissions that should be granted
|
|
175
|
+
uint256[8] memory expectedPermissions = [
|
|
177
176
|
uint256(JBPermissionIds.SET_SPLIT_GROUPS),
|
|
178
177
|
uint256(JBPermissionIds.SET_BUYBACK_POOL),
|
|
179
178
|
uint256(JBPermissionIds.SET_BUYBACK_TWAP),
|
|
180
179
|
uint256(JBPermissionIds.SET_PROJECT_URI),
|
|
181
180
|
uint256(JBPermissionIds.ADD_PRICE_FEED),
|
|
182
181
|
uint256(JBPermissionIds.SUCKER_SAFETY),
|
|
183
|
-
uint256(JBPermissionIds.ADD_SWAP_TERMINAL_POOL),
|
|
184
182
|
uint256(JBPermissionIds.SET_BUYBACK_HOOK),
|
|
185
|
-
uint256(JBPermissionIds.
|
|
183
|
+
uint256(JBPermissionIds.SET_ROUTER_TERMINAL)
|
|
186
184
|
];
|
|
187
185
|
|
|
188
186
|
for (uint256 i = 0; i < expectedPermissions.length; i++) {
|