Skip to content

Commit 5dbcc95

Browse files
committed
chore: forge fmt
1 parent 46041b0 commit 5dbcc95

File tree

10 files changed

+32
-38
lines changed

10 files changed

+32
-38
lines changed

packages/libs/contracts-sdk/contracts/LibVincentDiamondStorage.sol

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ library VincentUserStorage {
7272
// App ID -> Permitted App Version
7373
mapping(uint40 => uint24) permittedAppVersion;
7474
// App ID -> App version -> Ability IPFS CID hash -> Ability Policy storage -> Ability Policy IPFS CID hash -> User's CBOR2 encoded Policy parameter values
75-
mapping(uint40 => mapping(uint24 => mapping(bytes32 => mapping(bytes32 => bytes)))) abilityPolicyParameterValues;
75+
mapping(uint40 => mapping(uint24 => mapping(bytes32 => mapping(bytes32 => bytes))))
76+
abilityPolicyParameterValues;
7677
// Set of all App IDs that have ever been permitted (complete historical record, contains unpermitted apps too)
7778
EnumerableSet.UintSet allPermittedApps;
7879
// App ID -> Last Permitted App Version (for re-permitting unpermitted apps)

packages/libs/contracts-sdk/contracts/facets/VincentUserFacet.sol

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,7 @@ contract VincentUserFacet is VincentBase {
162162

163163
// Remove the PKP Token ID from the App's Delegated Agent PKPs
164164
// App versions start at 1, but the appVersions array is 0-indexed
165-
VincentAppStorage.appStorage().appIdToApp[appId].appVersions[getAppVersionIndex(appVersion)]
166-
.delegatedAgentPkps
165+
VincentAppStorage.appStorage().appIdToApp[appId].appVersions[getAppVersionIndex(appVersion)].delegatedAgentPkps
167166
.remove(pkpTokenId);
168167

169168
// Store the version as last permitted before removing (for potential re-permitting)
@@ -341,8 +340,9 @@ contract VincentUserFacet is VincentBase {
341340
EnumerableSet.Bytes32Set storage abilityPolicyIpfsCidHashes =
342341
versionedApp.abilityIpfsCidHashToAbilityPolicyIpfsCidHashes[hashedAbilityIpfsCid];
343342

344-
mapping(bytes32 => bytes) storage abilityPolicyParameterValues = us_.agentPkpTokenIdToAgentStorage[pkpTokenId]
345-
.abilityPolicyParameterValues[appId][appVersion][hashedAbilityIpfsCid];
343+
mapping(bytes32 => bytes) storage abilityPolicyParameterValues = us_.agentPkpTokenIdToAgentStorage[
344+
pkpTokenId
345+
].abilityPolicyParameterValues[appId][appVersion][hashedAbilityIpfsCid];
346346

347347
// Step 4: Iterate through each policy associated with the ability.
348348
for (uint256 j = 0; j < policyCount; j++) {

packages/libs/contracts-sdk/contracts/facets/VincentUserViewFacet.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ contract VincentUserViewFacet is VincentBase {
518518

519519
// Get the ability policy storage for this PKP, app, app version, and ability
520520
mapping(bytes32 => bytes) storage abilityPolicyParameterValues = us_.agentPkpTokenIdToAgentStorage[pkpTokenId]
521-
.abilityPolicyParameterValues[appId][appVersion][hashedAbilityIpfsCid];
521+
.abilityPolicyParameterValues[appId][appVersion][hashedAbilityIpfsCid];
522522

523523
// For each policy, get all its parameters
524524
for (uint256 i = 0; i < policyCount; i++) {

packages/libs/contracts-sdk/contracts/fees/facets/AavePerfFeeFacet.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ contract AavePerfFeeFacet {
9696
// there's a profit, calculate fee
9797
// performance fee is in basis points
9898
// so divide by 10000 to use it as a percentage
99-
performanceFeeAmount =
100-
(withdrawAssetAmount - depositAssetAmount) * LibFeeStorage.getStorage().performanceFeePercentage / 10000;
99+
performanceFeeAmount = (withdrawAssetAmount - depositAssetAmount)
100+
* LibFeeStorage.getStorage().performanceFeePercentage / 10000;
101101
}
102102

103103
// add the token to the set of tokens that have collected fees

packages/libs/contracts-sdk/contracts/fees/facets/AerodromeSwapFeeFacet.sol

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,8 @@ contract AerodromeSwapFeeFacet {
3737
IERC20(routes[0].from).approve(LibFeeStorage.getStorage().aerodromeRouter, amountIn);
3838

3939
// swap the tokens
40-
amounts = IRouter(LibFeeStorage.getStorage().aerodromeRouter).swapExactTokensForTokens(
41-
amountIn, amountOutMin, routes, address(this), deadline
42-
);
40+
amounts = IRouter(LibFeeStorage.getStorage().aerodromeRouter)
41+
.swapExactTokensForTokens(amountIn, amountOutMin, routes, address(this), deadline);
4342

4443
// add the input token to the collected fees list
4544
LibFeeStorage.getStorage().tokensWithCollectedFees.add(routes[0].from);

packages/libs/contracts-sdk/contracts/fees/facets/MorphoPerfFeeFacet.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ contract MorphoPerfFeeFacet {
9898
// there's a profit, calculate fee
9999
// performance fee is in basis points
100100
// so divide by 10000 to use it as a percentage
101-
performanceFeeAmount =
102-
(withdrawAssetAmount - depositAssetAmount) * LibFeeStorage.getStorage().performanceFeePercentage / 10000;
101+
performanceFeeAmount = (withdrawAssetAmount - depositAssetAmount)
102+
* LibFeeStorage.getStorage().performanceFeePercentage / 10000;
103103
}
104104

105105
// add the token to the set of tokens that have collected fees

packages/libs/contracts-sdk/script/DeployFeeDiamond.sol

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@ contract DeployFeeDiamond is Script {
9090
cuts[6] = contractToFacetCutAdd("AerodromeSwapFeeFacet", address(aerodromeSwapFeeFacet));
9191

9292
// Deploy the Diamond with the diamondCut facet and all other facets in one transaction
93-
Fee diamond = new Fee{salt: create2Salt}(
94-
cuts, FeeArgs({owner: deployerAddress, init: address(0), initCalldata: bytes("")})
95-
);
93+
Fee diamond = new Fee{
94+
salt: create2Salt
95+
}(cuts, FeeArgs({owner: deployerAddress, init: address(0), initCalldata: bytes("")}));
9696

9797
// Stop broadcasting transactions
9898
vm.stopBroadcast();

packages/libs/contracts-sdk/script/UpdateFacet.sol

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,7 @@ contract SmartUpdateFacet is Script {
156156
if (plan.toRemove.length > 0) {
157157
console2.log("Executing REMOVE for", plan.toRemove.length, "selectors");
158158
cuts[cutIndex] = IDiamondCut.FacetCut({
159-
facetAddress: address(0),
160-
action: IDiamondCut.FacetCutAction.Remove,
161-
functionSelectors: plan.toRemove
159+
facetAddress: address(0), action: IDiamondCut.FacetCutAction.Remove, functionSelectors: plan.toRemove
162160
});
163161
cutIndex++;
164162
}
@@ -178,9 +176,7 @@ contract SmartUpdateFacet is Script {
178176
if (plan.toAdd.length > 0) {
179177
console2.log("Executing ADD for", plan.toAdd.length, "selectors");
180178
cuts[cutIndex] = IDiamondCut.FacetCut({
181-
facetAddress: newFacetAddress,
182-
action: IDiamondCut.FacetCutAction.Add,
183-
functionSelectors: plan.toAdd
179+
facetAddress: newFacetAddress, action: IDiamondCut.FacetCutAction.Add, functionSelectors: plan.toAdd
184180
});
185181
cutIndex++;
186182
}

packages/libs/contracts-sdk/test/facets/VincentUserFacet.t.sol

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,10 @@ contract VincentUserFacetTest is Test {
271271
assertEq(abilitiesWithPolicies[0].policies[0].policyIpfsCid, POLICY_IPFS_CID_1);
272272
assertEq(abilitiesWithPolicies[0].policies[0].policyParameterValues, POLICY_PARAMETER_VALUES_1);
273273

274-
VincentUserViewFacet.AbilityExecutionValidation memory abilityExecutionValidation = vincentUserViewFacet
275-
.validateAbilityExecutionAndGetPolicies(APP_DELEGATEE_CHARLIE, PKP_TOKEN_ID_1, ABILITY_IPFS_CID_1);
274+
VincentUserViewFacet.AbilityExecutionValidation memory abilityExecutionValidation =
275+
vincentUserViewFacet.validateAbilityExecutionAndGetPolicies(
276+
APP_DELEGATEE_CHARLIE, PKP_TOKEN_ID_1, ABILITY_IPFS_CID_1
277+
);
276278
assertTrue(abilityExecutionValidation.isPermitted);
277279
assertEq(abilityExecutionValidation.appId, newAppId_1);
278280
assertEq(abilityExecutionValidation.appVersion, newAppVersion_1);
@@ -402,8 +404,10 @@ contract VincentUserFacetTest is Test {
402404
assertEq(permittedAppIds[0], newAppId_2);
403405

404406
// Verify ability execution validation for App 1 is no longer permitted
405-
VincentUserViewFacet.AbilityExecutionValidation memory abilityExecutionValidation = vincentUserViewFacet
406-
.validateAbilityExecutionAndGetPolicies(APP_DELEGATEE_CHARLIE, PKP_TOKEN_ID_1, ABILITY_IPFS_CID_1);
407+
VincentUserViewFacet.AbilityExecutionValidation memory abilityExecutionValidation =
408+
vincentUserViewFacet.validateAbilityExecutionAndGetPolicies(
409+
APP_DELEGATEE_CHARLIE, PKP_TOKEN_ID_1, ABILITY_IPFS_CID_1
410+
);
407411
assertFalse(abilityExecutionValidation.isPermitted);
408412

409413
bool isPermitted =
@@ -635,8 +639,10 @@ contract VincentUserFacetTest is Test {
635639
assertEq(abilitiesWithPolicies[1].policies.length, 0);
636640

637641
// Verify ability execution validation returns empty parameters
638-
VincentUserViewFacet.AbilityExecutionValidation memory abilityExecutionValidation = vincentUserViewFacet
639-
.validateAbilityExecutionAndGetPolicies(APP_DELEGATEE_CHARLIE, PKP_TOKEN_ID_1, ABILITY_IPFS_CID_1);
642+
VincentUserViewFacet.AbilityExecutionValidation memory abilityExecutionValidation =
643+
vincentUserViewFacet.validateAbilityExecutionAndGetPolicies(
644+
APP_DELEGATEE_CHARLIE, PKP_TOKEN_ID_1, ABILITY_IPFS_CID_1
645+
);
640646
assertTrue(abilityExecutionValidation.isPermitted);
641647
assertEq(abilityExecutionValidation.policies.length, 1);
642648
assertEq(abilityExecutionValidation.policies[0].policyParameterValues, bytes("")); // Empty bytes after removal

packages/libs/contracts-sdk/test/fees/MorphoFeeForkTest.t.sol

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,7 @@ contract MorphoFeeForkTest is Test {
121121
vm.warp(block.timestamp + 1 weeks);
122122
morpho.accrueInterest(
123123
Morpho.MarketParams({
124-
loanToken: loanToken,
125-
collateralToken: collateralToken,
126-
oracle: oracle,
127-
irm: irm,
128-
lltv: lltv
124+
loanToken: loanToken, collateralToken: collateralToken, oracle: oracle, irm: irm, lltv: lltv
129125
})
130126
);
131127

@@ -326,11 +322,7 @@ contract MorphoFeeForkTest is Test {
326322
vm.warp(block.timestamp + 1 weeks);
327323
morpho.accrueInterest(
328324
Morpho.MarketParams({
329-
loanToken: loanToken,
330-
collateralToken: collateralToken,
331-
oracle: oracle,
332-
irm: irm,
333-
lltv: lltv
325+
loanToken: loanToken, collateralToken: collateralToken, oracle: oracle, irm: irm, lltv: lltv
334326
})
335327
);
336328

0 commit comments

Comments
 (0)